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

Side by Side Diff: chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

Issue 2541063002: Revert of Remove about:srcdoc url conversion. (Closed)
Patch Set: 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 (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
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) override { 274 bool is_error_page,
275 bool is_iframe_srcdoc) override {
275 if (validated_url == url_) { 276 if (validated_url == url_) {
276 url_seen_ = true; 277 url_seen_ = true;
277 message_loop_runner_->Quit(); 278 message_loop_runner_->Quit();
278 } 279 }
279 } 280 }
280 281
281 // Run a nested message loop until navigation to the expected URL has started. 282 // Run a nested message loop until navigation to the expected URL has started.
282 void Wait() { 283 void Wait() {
283 if (url_seen_) 284 if (url_seen_)
284 return; 285 return;
(...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after
812 "extensions/api_test/webnavigation/crash/b.html", 813 "extensions/api_test/webnavigation/crash/b.html",
813 embedded_test_server()->port())); 814 embedded_test_server()->port()));
814 ui_test_utils::NavigateToURL(browser(), url); 815 ui_test_utils::NavigateToURL(browser(), url);
815 816
816 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); 817 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
817 } 818 }
818 819
819 #endif 820 #endif
820 821
821 } // namespace extensions 822 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc ('k') | chrome/browser/history/history_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698