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

Side by Side Diff: components/test_runner/web_frame_test_proxy.h

Issue 2147633003: PlzNavigate: Eliminate test_runner bailing out of layout tests too early (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 4 months 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ 5 #ifndef COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
6 #define COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ 6 #define COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 blink::WebHistoryCommitType commit_type) override { 156 blink::WebHistoryCommitType commit_type) override {
157 test_client()->didFailLoad(frame, error, commit_type); 157 test_client()->didFailLoad(frame, error, commit_type);
158 Base::didFailLoad(frame, error, commit_type); 158 Base::didFailLoad(frame, error, commit_type);
159 } 159 }
160 160
161 void didFinishLoad(blink::WebLocalFrame* frame) override { 161 void didFinishLoad(blink::WebLocalFrame* frame) override {
162 Base::didFinishLoad(frame); 162 Base::didFinishLoad(frame);
163 test_client()->didFinishLoad(frame); 163 test_client()->didFinishLoad(frame);
164 } 164 }
165 165
166 void didNavigateWithinPage(blink::WebLocalFrame* frame,
167 const blink::WebHistoryItem& history_item,
168 blink::WebHistoryCommitType commit_type,
169 bool content_initiated) override {
170 Base::didNavigateWithinPage(frame, history_item, commit_type,
171 content_initiated);
172 test_client()->didNavigateWithinPage(frame, history_item, commit_type,
173 content_initiated);
174 }
175
166 void didStopLoading() override { 176 void didStopLoading() override {
167 Base::didStopLoading(); 177 Base::didStopLoading();
168 test_client()->didStopLoading(); 178 test_client()->didStopLoading();
169 } 179 }
170 180
171 void didChangeSelection(bool is_selection_empty) override { 181 void didChangeSelection(bool is_selection_empty) override {
172 test_client()->didChangeSelection(is_selection_empty); 182 test_client()->didChangeSelection(is_selection_empty);
173 Base::didChangeSelection(is_selection_empty); 183 Base::didChangeSelection(is_selection_empty);
174 } 184 }
175 185
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 blink::WebNavigationPolicy decidePolicyForNavigation( 266 blink::WebNavigationPolicy decidePolicyForNavigation(
257 const blink::WebFrameClient::NavigationPolicyInfo& info) override { 267 const blink::WebFrameClient::NavigationPolicyInfo& info) override {
258 blink::WebNavigationPolicy policy = 268 blink::WebNavigationPolicy policy =
259 test_client()->decidePolicyForNavigation(info); 269 test_client()->decidePolicyForNavigation(info);
260 if (policy == blink::WebNavigationPolicyIgnore) 270 if (policy == blink::WebNavigationPolicyIgnore)
261 return policy; 271 return policy;
262 272
263 return Base::decidePolicyForNavigation(info); 273 return Base::decidePolicyForNavigation(info);
264 } 274 }
265 275
276 void didStartLoading(bool to_different_document) override {
277 Base::didStartLoading(to_different_document);
278 test_client()->didStartLoading(to_different_document);
279 }
280
266 void willStartUsingPeerConnectionHandler( 281 void willStartUsingPeerConnectionHandler(
267 blink::WebRTCPeerConnectionHandler* handler) override { 282 blink::WebRTCPeerConnectionHandler* handler) override {
268 // RenderFrameImpl::willStartUsingPeerConnectionHandler can not be mocked. 283 // RenderFrameImpl::willStartUsingPeerConnectionHandler can not be mocked.
269 // See http://crbug/363285. 284 // See http://crbug/363285.
270 } 285 }
271 286
272 blink::WebUserMediaClient* userMediaClient() override { 287 blink::WebUserMediaClient* userMediaClient() override {
273 return test_client()->userMediaClient(); 288 return test_client()->userMediaClient();
274 } 289 }
275 290
(...skipping 20 matching lines...) Expand all
296 return test_client()->runFileChooser(params, completion); 311 return test_client()->runFileChooser(params, completion);
297 } 312 }
298 313
299 private: 314 private:
300 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); 315 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy);
301 }; 316 };
302 317
303 } // namespace test_runner 318 } // namespace test_runner
304 319
305 #endif // COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ 320 #endif // COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698