Merge 275988 "Move about://-related constants from //content to ..."

content/shell/renderer/webkit_test_runner.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/shell/renderer/webkit_test_runner.h"
 
 #include <algorithm>
 #include <clocale>
 #include <cmath>
 
@@ skipping 133 matching lines @@
 class NavigateAwayVisitor : public RenderViewVisitor {
  public:
   explicit NavigateAwayVisitor(RenderView* main_render_view)
       : main_render_view_(main_render_view) {}
   virtual ~NavigateAwayVisitor() {}
 
   virtual bool Visit(RenderView* render_view) OVERRIDE {
     if (render_view == main_render_view_)
       return true;
     render_view->GetWebView()->mainFrame()->loadRequest(
-        WebURLRequest(GURL(kAboutBlankURL)));
+        WebURLRequest(GURL(url::kAboutBlankURL)));
     return true;
   }
 
  private:
   RenderView* main_render_view_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigateAwayVisitor);
 };
 
 class UseSynchronousResizeModeVisitor : public RenderViewVisitor {
@@ skipping 534 matching lines @@
   current_entry_indexes_ = current_entry_indexes;
   CaptureDump();
 }
 
 void WebKitTestRunner::OnReset() {
   ShellRenderProcessObserver::GetInstance()->test_interfaces()->resetAll();
   Reset();
   // 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()));
 }
 
 void WebKitTestRunner::OnNotifyDone() {
   render_view()->GetWebView()->mainFrame()->executeScript(
       WebScriptSource(WebString::fromUTF8("testRunner.notifyDone();")));
 }
 
 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);
 }
 
 void WebKitTestRunner::ReportLeakDetectionResult(
     const LeakDetectionResult& report) {
   Send(new ShellViewHostMsg_LeakDetectionDone(routing_id(), report));
 }
 
 }  // namespace content