OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <list> | 5 #include <list> |
6 #include <set> | 6 #include <set> |
7 | 7 |
8 #include "base/files/scoped_temp_dir.h" | 8 #include "base/files/scoped_temp_dir.h" |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
264 const GURL& expected_url) | 264 const GURL& expected_url) |
265 : content::WebContentsObserver(web_contents), | 265 : content::WebContentsObserver(web_contents), |
266 url_(expected_url), | 266 url_(expected_url), |
267 url_seen_(false), | 267 url_seen_(false), |
268 message_loop_runner_(new content::MessageLoopRunner) {} | 268 message_loop_runner_(new content::MessageLoopRunner) {} |
269 ~StartProvisionalLoadObserver() override {} | 269 ~StartProvisionalLoadObserver() override {} |
270 | 270 |
271 void DidStartProvisionalLoadForFrame( | 271 void DidStartProvisionalLoadForFrame( |
272 content::RenderFrameHost* render_frame_host, | 272 content::RenderFrameHost* render_frame_host, |
273 const GURL& validated_url, | 273 const GURL& validated_url, |
274 bool is_error_page, | 274 bool is_error_page) override { |
275 bool is_iframe_srcdoc) override { | |
276 if (validated_url == url_) { | 275 if (validated_url == url_) { |
277 url_seen_ = true; | 276 url_seen_ = true; |
278 message_loop_runner_->Quit(); | 277 message_loop_runner_->Quit(); |
279 } | 278 } |
280 } | 279 } |
281 | 280 |
282 // Run a nested message loop until navigation to the expected URL has started. | 281 // Run a nested message loop until navigation to the expected URL has started. |
283 void Wait() { | 282 void Wait() { |
284 if (url_seen_) | 283 if (url_seen_) |
285 return; | 284 return; |
(...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
813 "extensions/api_test/webnavigation/crash/b.html", | 812 "extensions/api_test/webnavigation/crash/b.html", |
814 embedded_test_server()->port())); | 813 embedded_test_server()->port())); |
815 ui_test_utils::NavigateToURL(browser(), url); | 814 ui_test_utils::NavigateToURL(browser(), url); |
816 | 815 |
817 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 816 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
818 } | 817 } |
819 | 818 |
820 #endif | 819 #endif |
821 | 820 |
822 } // namespace extensions | 821 } // namespace extensions |
OLD | NEW |