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

Unified Diff: content/shell/renderer/webkit_test_runner.cc

Issue 328713006: Merge 275988 "Move about://-related constants from //content to ..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/2042/src/
Patch Set: Created 6 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/shell/browser/shell_application_mac.mm ('k') | content/test/accessibility_browser_test_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/renderer/webkit_test_runner.cc
===================================================================
--- content/shell/renderer/webkit_test_runner.cc (revision 276109)
+++ content/shell/renderer/webkit_test_runner.cc (working copy)
@@ -151,7 +151,7 @@
if (render_view == main_render_view_)
return true;
render_view->GetWebView()->mainFrame()->loadRequest(
- WebURLRequest(GURL(kAboutBlankURL)));
+ WebURLRequest(GURL(url::kAboutBlankURL)));
return true;
}
@@ -706,7 +706,7 @@
// Navigating to about:blank will make sure that no new loads are initiated
// by the renderer.
render_view()->GetWebView()->mainFrame()->loadRequest(
- WebURLRequest(GURL(kAboutBlankURL)));
+ WebURLRequest(GURL(url::kAboutBlankURL)));
Send(new ShellViewHostMsg_ResetDone(routing_id()));
}
@@ -718,7 +718,7 @@
void WebKitTestRunner::OnTryLeakDetection() {
WebLocalFrame* main_frame =
render_view()->GetWebView()->mainFrame()->toWebLocalFrame();
- DCHECK_EQ(GURL(kAboutBlankURL), GURL(main_frame->document().url()));
+ DCHECK_EQ(GURL(url::kAboutBlankURL), GURL(main_frame->document().url()));
DCHECK(!main_frame->isLoading());
leak_detector_->TryLeakDetection(main_frame);
« no previous file with comments | « content/shell/browser/shell_application_mac.mm ('k') | content/test/accessibility_browser_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698