| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/data_use_measurement/chrome_data_use_ascriber.h" | 5 #include "chrome/browser/data_use_measurement/chrome_data_use_ascriber.h" |
| 6 | 6 |
| 7 #include <list> | 7 #include <list> |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 TEST_F(ChromeDataUseAscriberTest, RenderFrameShownAndHidden) { | 118 TEST_F(ChromeDataUseAscriberTest, RenderFrameShownAndHidden) { |
| 119 std::unique_ptr<net::URLRequest> request = CreateNewRequest( | 119 std::unique_ptr<net::URLRequest> request = CreateNewRequest( |
| 120 "http://test.com", true, kRequestId, kRenderProcessId, kRenderFrameId); | 120 "http://test.com", true, kRequestId, kRenderProcessId, kRenderFrameId); |
| 121 | 121 |
| 122 ascriber()->RenderFrameCreated(kRenderProcessId, kRenderFrameId, -1, -1); | 122 ascriber()->RenderFrameCreated(kRenderProcessId, kRenderFrameId, -1, -1); |
| 123 ascriber()->OnBeforeUrlRequest(request.get()); | 123 ascriber()->OnBeforeUrlRequest(request.get()); |
| 124 ascriber()->ReadyToCommitMainFrameNavigation( | 124 ascriber()->ReadyToCommitMainFrameNavigation( |
| 125 content::GlobalRequestID(kRenderProcessId, 0), kRenderProcessId, | 125 content::GlobalRequestID(kRenderProcessId, 0), kRenderProcessId, |
| 126 kRenderFrameId); | 126 kRenderFrameId); |
| 127 ascriber()->DidFinishMainFrameNavigation(kRenderProcessId, kRenderFrameId, | 127 ascriber()->DidFinishMainFrameNavigation(kRenderProcessId, kRenderFrameId, |
| 128 GURL("http://test.com"), true, | 128 GURL("http://test.com"), false, |
| 129 kPageTransition); | 129 kPageTransition); |
| 130 ascriber()->WasShownOrHidden(kRenderProcessId, kRenderFrameId, true); | 130 ascriber()->WasShownOrHidden(kRenderProcessId, kRenderFrameId, true); |
| 131 | 131 |
| 132 EXPECT_TRUE(ascriber()->GetDataUseRecorder(*request)->is_visible()); | 132 EXPECT_TRUE(ascriber()->GetDataUseRecorder(*request)->is_visible()); |
| 133 | 133 |
| 134 // Hide the frame, and the visibility should be updated. | 134 // Hide the frame, and the visibility should be updated. |
| 135 ascriber()->WasShownOrHidden(kRenderProcessId, kRenderFrameId, false); | 135 ascriber()->WasShownOrHidden(kRenderProcessId, kRenderFrameId, false); |
| 136 EXPECT_FALSE(ascriber()->GetDataUseRecorder(*request)->is_visible()); | 136 EXPECT_FALSE(ascriber()->GetDataUseRecorder(*request)->is_visible()); |
| 137 | 137 |
| 138 ascriber()->RenderFrameDeleted(kRenderProcessId, kRenderFrameId, -1, -1); | 138 ascriber()->RenderFrameDeleted(kRenderProcessId, kRenderFrameId, -1, -1); |
| 139 } | 139 } |
| 140 | 140 |
| 141 TEST_F(ChromeDataUseAscriberTest, RenderFrameHiddenAndShown) { | 141 TEST_F(ChromeDataUseAscriberTest, RenderFrameHiddenAndShown) { |
| 142 std::unique_ptr<net::URLRequest> request = CreateNewRequest( | 142 std::unique_ptr<net::URLRequest> request = CreateNewRequest( |
| 143 "http://test.com", true, kRequestId, kRenderProcessId, kRenderFrameId); | 143 "http://test.com", true, kRequestId, kRenderProcessId, kRenderFrameId); |
| 144 | 144 |
| 145 ascriber()->RenderFrameCreated(kRenderProcessId, kRenderFrameId, -1, -1); | 145 ascriber()->RenderFrameCreated(kRenderProcessId, kRenderFrameId, -1, -1); |
| 146 ascriber()->OnBeforeUrlRequest(request.get()); | 146 ascriber()->OnBeforeUrlRequest(request.get()); |
| 147 ascriber()->ReadyToCommitMainFrameNavigation( | 147 ascriber()->ReadyToCommitMainFrameNavigation( |
| 148 content::GlobalRequestID(kRenderProcessId, 0), kRenderProcessId, | 148 content::GlobalRequestID(kRenderProcessId, 0), kRenderProcessId, |
| 149 kRenderFrameId); | 149 kRenderFrameId); |
| 150 ascriber()->DidFinishMainFrameNavigation(kRenderProcessId, kRenderFrameId, | 150 ascriber()->DidFinishMainFrameNavigation(kRenderProcessId, kRenderFrameId, |
| 151 GURL("http://test.com"), true, | 151 GURL("http://test.com"), false, |
| 152 kPageTransition); | 152 kPageTransition); |
| 153 ascriber()->WasShownOrHidden(kRenderProcessId, kRenderFrameId, false); | 153 ascriber()->WasShownOrHidden(kRenderProcessId, kRenderFrameId, false); |
| 154 | 154 |
| 155 EXPECT_FALSE(ascriber()->GetDataUseRecorder(*request)->is_visible()); | 155 EXPECT_FALSE(ascriber()->GetDataUseRecorder(*request)->is_visible()); |
| 156 | 156 |
| 157 // Show the frame, and the visibility should be updated. | 157 // Show the frame, and the visibility should be updated. |
| 158 ascriber()->WasShownOrHidden(kRenderProcessId, kRenderFrameId, true); | 158 ascriber()->WasShownOrHidden(kRenderProcessId, kRenderFrameId, true); |
| 159 EXPECT_TRUE(ascriber()->GetDataUseRecorder(*request)->is_visible()); | 159 EXPECT_TRUE(ascriber()->GetDataUseRecorder(*request)->is_visible()); |
| 160 | 160 |
| 161 ascriber()->RenderFrameDeleted(kRenderProcessId, kRenderFrameId, -1, -1); | 161 ascriber()->RenderFrameDeleted(kRenderProcessId, kRenderFrameId, -1, -1); |
| 162 } | 162 } |
| 163 | 163 |
| 164 TEST_F(ChromeDataUseAscriberTest, RenderFrameHostChanged) { | 164 TEST_F(ChromeDataUseAscriberTest, RenderFrameHostChanged) { |
| 165 std::unique_ptr<net::URLRequest> request = CreateNewRequest( | 165 std::unique_ptr<net::URLRequest> request = CreateNewRequest( |
| 166 "http://test.com", true, kRequestId, kRenderProcessId, kRenderFrameId); | 166 "http://test.com", true, kRequestId, kRenderProcessId, kRenderFrameId); |
| 167 | 167 |
| 168 ascriber()->RenderFrameCreated(kRenderProcessId, kRenderFrameId, -1, -1); | 168 ascriber()->RenderFrameCreated(kRenderProcessId, kRenderFrameId, -1, -1); |
| 169 ascriber()->OnBeforeUrlRequest(request.get()); | 169 ascriber()->OnBeforeUrlRequest(request.get()); |
| 170 ascriber()->ReadyToCommitMainFrameNavigation( | 170 ascriber()->ReadyToCommitMainFrameNavigation( |
| 171 content::GlobalRequestID(kRenderProcessId, 0), kRenderProcessId, | 171 content::GlobalRequestID(kRenderProcessId, 0), kRenderProcessId, |
| 172 kRenderFrameId); | 172 kRenderFrameId); |
| 173 ascriber()->DidFinishMainFrameNavigation(kRenderProcessId, kRenderFrameId, | 173 ascriber()->DidFinishMainFrameNavigation(kRenderProcessId, kRenderFrameId, |
| 174 GURL("http://test.com"), true, | 174 GURL("http://test.com"), false, |
| 175 kPageTransition); | 175 kPageTransition); |
| 176 ascriber()->WasShownOrHidden(kRenderProcessId, kRenderFrameId, true); | 176 ascriber()->WasShownOrHidden(kRenderProcessId, kRenderFrameId, true); |
| 177 EXPECT_TRUE(ascriber()->GetDataUseRecorder(*request)->is_visible()); | 177 EXPECT_TRUE(ascriber()->GetDataUseRecorder(*request)->is_visible()); |
| 178 | 178 |
| 179 // Create a new render frame and swap it. | 179 // Create a new render frame and swap it. |
| 180 ascriber()->RenderFrameCreated(kRenderProcessId + 1, kRenderFrameId + 1, -1, | 180 ascriber()->RenderFrameCreated(kRenderProcessId + 1, kRenderFrameId + 1, -1, |
| 181 -1); | 181 -1); |
| 182 ascriber()->RenderFrameHostChanged(kRenderProcessId, kRenderFrameId, | 182 ascriber()->RenderFrameHostChanged(kRenderProcessId, kRenderFrameId, |
| 183 kRenderProcessId + 1, kRenderFrameId + 1); | 183 kRenderProcessId + 1, kRenderFrameId + 1); |
| 184 ascriber()->RenderFrameDeleted(kRenderProcessId, kRenderFrameId, -1, -1); | 184 ascriber()->RenderFrameDeleted(kRenderProcessId, kRenderFrameId, -1, -1); |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 368 EXPECT_CALL(mock_observer, OnPageLoadComplete(&recorder_entry.data_use())) | 368 EXPECT_CALL(mock_observer, OnPageLoadComplete(&recorder_entry.data_use())) |
| 369 .Times(1); | 369 .Times(1); |
| 370 | 370 |
| 371 ascriber()->RenderFrameDeleted(kRenderProcessId, kRenderFrameId, -1, -1); | 371 ascriber()->RenderFrameDeleted(kRenderProcessId, kRenderFrameId, -1, -1); |
| 372 ascriber()->OnUrlRequestDestroyed(request.get()); | 372 ascriber()->OnUrlRequestDestroyed(request.get()); |
| 373 | 373 |
| 374 EXPECT_EQ(0u, recorders().size()); | 374 EXPECT_EQ(0u, recorders().size()); |
| 375 } | 375 } |
| 376 | 376 |
| 377 } // namespace data_use_measurement | 377 } // namespace data_use_measurement |
| OLD | NEW |