Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Side by Side Diff: chrome/browser/data_use_measurement/chrome_data_use_ascriber_unittest.cc

Issue 2583703002: Record the tab state during data use (Closed)
Patch Set: minor fix Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 std::unique_ptr<net::URLRequest> request = CreateNewRequest( 108 std::unique_ptr<net::URLRequest> request = CreateNewRequest(
109 "http://test.com", true, kRequestId, kRenderProcessId, kRenderFrameId); 109 "http://test.com", true, kRequestId, kRenderProcessId, kRenderFrameId);
110 110
111 ascriber()->RenderFrameCreated(kRenderProcessId, kRenderFrameId, -1, -1); 111 ascriber()->RenderFrameCreated(kRenderProcessId, kRenderFrameId, -1, -1);
112 ascriber()->OnBeforeUrlRequest(request.get()); 112 ascriber()->OnBeforeUrlRequest(request.get());
113 ascriber()->ReadyToCommitMainFrameNavigation( 113 ascriber()->ReadyToCommitMainFrameNavigation(
114 GURL("http://test.com"), content::GlobalRequestID(kRenderProcessId, 0), 114 GURL("http://test.com"), content::GlobalRequestID(kRenderProcessId, 0),
115 kRenderProcessId, kRenderFrameId, true, (void*)request.get()); 115 kRenderProcessId, kRenderFrameId, true, (void*)request.get());
116 ascriber()->WasShownOrHidden(kRenderProcessId, kRenderFrameId, true); 116 ascriber()->WasShownOrHidden(kRenderProcessId, kRenderFrameId, true);
117 117
118 EXPECT_TRUE( 118 EXPECT_TRUE(ascriber()->GetDataUseRecorder(*request)->is_visible());
119 ascriber()->GetDataUseRecorder(request.get(), true)->is_visible());
120 119
121 // Hide the frame, and the visibility should be updated. 120 // Hide the frame, and the visibility should be updated.
122 ascriber()->WasShownOrHidden(kRenderProcessId, kRenderFrameId, false); 121 ascriber()->WasShownOrHidden(kRenderProcessId, kRenderFrameId, false);
123 EXPECT_FALSE( 122 EXPECT_FALSE(ascriber()->GetDataUseRecorder(*request)->is_visible());
124 ascriber()->GetDataUseRecorder(request.get(), true)->is_visible());
125 123
126 ascriber()->RenderFrameDeleted(kRenderProcessId, kRenderFrameId, -1, -1); 124 ascriber()->RenderFrameDeleted(kRenderProcessId, kRenderFrameId, -1, -1);
127 } 125 }
128 126
129 TEST_F(ChromeDataUseAscriberTest, RenderFrameHiddenAndShown) { 127 TEST_F(ChromeDataUseAscriberTest, RenderFrameHiddenAndShown) {
130 if (content::IsBrowserSideNavigationEnabled()) 128 if (content::IsBrowserSideNavigationEnabled())
131 return; 129 return;
132 130
133 std::unique_ptr<net::URLRequest> request = CreateNewRequest( 131 std::unique_ptr<net::URLRequest> request = CreateNewRequest(
134 "http://test.com", true, kRequestId, kRenderProcessId, kRenderFrameId); 132 "http://test.com", true, kRequestId, kRenderProcessId, kRenderFrameId);
135 133
136 ascriber()->RenderFrameCreated(kRenderProcessId, kRenderFrameId, -1, -1); 134 ascriber()->RenderFrameCreated(kRenderProcessId, kRenderFrameId, -1, -1);
137 ascriber()->OnBeforeUrlRequest(request.get()); 135 ascriber()->OnBeforeUrlRequest(request.get());
138 ascriber()->ReadyToCommitMainFrameNavigation( 136 ascriber()->ReadyToCommitMainFrameNavigation(
139 GURL("http://test.com"), content::GlobalRequestID(kRenderProcessId, 0), 137 GURL("http://test.com"), content::GlobalRequestID(kRenderProcessId, 0),
140 kRenderProcessId, kRenderFrameId, true, (void*)request.get()); 138 kRenderProcessId, kRenderFrameId, true, (void*)request.get());
141 ascriber()->WasShownOrHidden(kRenderProcessId, kRenderFrameId, false); 139 ascriber()->WasShownOrHidden(kRenderProcessId, kRenderFrameId, false);
142 140
143 EXPECT_FALSE( 141 EXPECT_FALSE(ascriber()->GetDataUseRecorder(*request)->is_visible());
144 ascriber()->GetDataUseRecorder(request.get(), true)->is_visible());
145 142
146 // Show the frame, and the visibility should be updated. 143 // Show the frame, and the visibility should be updated.
147 ascriber()->WasShownOrHidden(kRenderProcessId, kRenderFrameId, true); 144 ascriber()->WasShownOrHidden(kRenderProcessId, kRenderFrameId, true);
148 EXPECT_TRUE( 145 EXPECT_TRUE(ascriber()->GetDataUseRecorder(*request)->is_visible());
149 ascriber()->GetDataUseRecorder(request.get(), true)->is_visible());
150 146
151 ascriber()->RenderFrameDeleted(kRenderProcessId, kRenderFrameId, -1, -1); 147 ascriber()->RenderFrameDeleted(kRenderProcessId, kRenderFrameId, -1, -1);
152 } 148 }
153 149
154 TEST_F(ChromeDataUseAscriberTest, RenderFrameHostChanged) { 150 TEST_F(ChromeDataUseAscriberTest, RenderFrameHostChanged) {
155 if (content::IsBrowserSideNavigationEnabled()) 151 if (content::IsBrowserSideNavigationEnabled())
156 return; 152 return;
157 153
158 std::unique_ptr<net::URLRequest> request = CreateNewRequest( 154 std::unique_ptr<net::URLRequest> request = CreateNewRequest(
159 "http://test.com", true, kRequestId, kRenderProcessId, kRenderFrameId); 155 "http://test.com", true, kRequestId, kRenderProcessId, kRenderFrameId);
160 156
161 ascriber()->RenderFrameCreated(kRenderProcessId, kRenderFrameId, -1, -1); 157 ascriber()->RenderFrameCreated(kRenderProcessId, kRenderFrameId, -1, -1);
162 ascriber()->OnBeforeUrlRequest(request.get()); 158 ascriber()->OnBeforeUrlRequest(request.get());
163 ascriber()->ReadyToCommitMainFrameNavigation( 159 ascriber()->ReadyToCommitMainFrameNavigation(
164 GURL("http://test.com"), content::GlobalRequestID(kRenderProcessId, 0), 160 GURL("http://test.com"), content::GlobalRequestID(kRenderProcessId, 0),
165 kRenderProcessId, kRenderFrameId, true, (void*)request.get()); 161 kRenderProcessId, kRenderFrameId, true, (void*)request.get());
166 ascriber()->WasShownOrHidden(kRenderProcessId, kRenderFrameId, true); 162 ascriber()->WasShownOrHidden(kRenderProcessId, kRenderFrameId, true);
167 EXPECT_TRUE( 163 EXPECT_TRUE(ascriber()->GetDataUseRecorder(*request)->is_visible());
168 ascriber()->GetDataUseRecorder(request.get(), true)->is_visible());
169 164
170 // Create a new render frame and swap it. 165 // Create a new render frame and swap it.
171 ascriber()->RenderFrameCreated(kRenderProcessId + 1, kRenderFrameId + 1, -1, 166 ascriber()->RenderFrameCreated(kRenderProcessId + 1, kRenderFrameId + 1, -1,
172 -1); 167 -1);
173 ascriber()->RenderFrameHostChanged(kRenderProcessId, kRenderFrameId, 168 ascriber()->RenderFrameHostChanged(kRenderProcessId, kRenderFrameId,
174 kRenderProcessId + 1, kRenderFrameId + 1); 169 kRenderProcessId + 1, kRenderFrameId + 1);
175 ascriber()->RenderFrameDeleted(kRenderProcessId, kRenderFrameId, -1, -1); 170 ascriber()->RenderFrameDeleted(kRenderProcessId, kRenderFrameId, -1, -1);
176 171
177 ascriber()->WasShownOrHidden(kRenderProcessId + 1, kRenderFrameId + 1, true); 172 ascriber()->WasShownOrHidden(kRenderProcessId + 1, kRenderFrameId + 1, true);
178 ascriber()->RenderFrameDeleted(kRenderProcessId + 1, kRenderFrameId + 1, -1, 173 ascriber()->RenderFrameDeleted(kRenderProcessId + 1, kRenderFrameId + 1, -1,
179 -1); 174 -1);
180 } 175 }
181 176
182 } // namespace data_use_measurement 177 } // namespace data_use_measurement
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698