Cleanup: Use content::kAboutBlankURL instead of the raw string in content/.

Review URL: https://chromiumcodereview.appspot.com/21955003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215779 0039d316-1c4b-4281-b951-d872f2087c98

12 files changed, 51 insertions, 45 deletions

diff --git a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
index da7239c..d0ff119 100644
--- a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
+++ b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc
@@ -20,6 +20,7 @@
 #include "content/port/browser/render_widget_host_view_port.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_paths.h"
+#include "content/public/common/url_constants.h"
 #include "content/shell/shell.h"
 #include "content/test/accessibility_browser_test_utils.h"
 #include "content/test/content_browser_test.h"
@@ -60,8 +61,8 @@ class DumpAccessibilityTreeTest : public ContentBrowserTest {
  public:
   // Utility helper that does a comment aware equality check.
   // Returns array of lines from expected file which are different.
-  std::vector<int> DiffLines(std::vector<std::string>& expected_lines,
-                             std::vector<std::string>& actual_lines) {
+  std::vector<int> DiffLines(const std::vector<std::string>& expected_lines,
+                             const std::vector<std::string>& actual_lines) {
     int actual_lines_count = actual_lines.size();
     int expected_lines_count = expected_lines.size();
     std::vector<int> diff_lines;
@@ -123,7 +124,7 @@ class DumpAccessibilityTreeTest : public ContentBrowserTest {
 
 void DumpAccessibilityTreeTest::RunTest(
     const base::FilePath::CharType* file_path) {
-  NavigateToURL(shell(), GURL("about:blank"));
+  NavigateToURL(shell(), GURL(kAboutBlankURL));
 
   // Setup test paths.
   base::FilePath dir_test_data;
@@ -206,7 +207,7 @@ void DumpAccessibilityTreeTest::RunTest(
       if (diff_index < static_cast<int>(diff_lines.size()) &&
           diff_lines[diff_index] == line) {
         is_diff = true;
-        ++ diff_index;
+        ++diff_index;
       }
       printf("%1s %4d %s\n", is_diff? kSignalDiff : "", line + 1,
              expected_lines[line].c_str());
diff --git a/content/browser/loader/resource_dispatcher_host_browsertest.cc b/content/browser/loader/resource_dispatcher_host_browsertest.cc
index 124394b..e5a6061 100644
--- a/content/browser/loader/resource_dispatcher_host_browsertest.cc
+++ b/content/browser/loader/resource_dispatcher_host_browsertest.cc
@@ -245,7 +245,7 @@ IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
 
   // Navigate to a cross-site page that loads immediately without making a
   // network request.  The unload event should still be run.
-  NavigateToURL(shell(), GURL("about:blank"));
+  NavigateToURL(shell(), GURL(kAboutBlankURL));
 
   // Check that the cookie was set.
   EXPECT_EQ("onunloadCookie=foo", GetCookies(url));
diff --git a/content/browser/media/media_browsertest.cc b/content/browser/media/media_browsertest.cc
index ce5b435..e5bc620 100644
--- a/content/browser/media/media_browsertest.cc
+++ b/content/browser/media/media_browsertest.cc
@@ -7,6 +7,7 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/url_constants.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/shell/shell.h"
 #include "content/test/content_browser_test_utils.h"
@@ -34,7 +35,7 @@ void MediaBrowserTest::RunMediaTestPage(
     std::vector<StringPair>::const_iterator itr = query_params->begin();
     query = base::StringPrintf("%s=%s", itr->first, itr->second);
     ++itr;
-    for (;itr != query_params->end(); ++itr) {
+    for (; itr != query_params->end(); ++itr) {
       query.append(base::StringPrintf("&%s=%s", itr->first, itr->second));
     }
   }
@@ -184,7 +185,7 @@ IN_PROC_BROWSER_TEST_P(MediaTest, VideoTulipWebm) {
 // Covers tear-down when navigating away as opposed to browser exiting.
 IN_PROC_BROWSER_TEST_F(MediaTest, Navigate) {
   PlayVideo("bear.ogv", false);
-  NavigateToURL(shell(), GURL("about:blank"));
+  NavigateToURL(shell(), GURL(kAboutBlankURL));
   EXPECT_FALSE(shell()->web_contents()->IsCrashed());
 }
 
diff --git a/content/browser/renderer_host/render_view_host_unittest.cc b/content/browser/renderer_host/render_view_host_unittest.cc
index 810439d..a38e044 100644
--- a/content/browser/renderer_host/render_view_host_unittest.cc
+++ b/content/browser/renderer_host/render_view_host_unittest.cc
@@ -63,7 +63,7 @@ class RenderViewHostTest : public RenderViewHostImplTestHarness {
 TEST_F(RenderViewHostTest, FilterAbout) {
   test_rvh()->SendNavigate(1, GURL("about:cache"));
   ASSERT_TRUE(controller().GetActiveEntry());
-  EXPECT_EQ(GURL("about:blank"), controller().GetActiveEntry()->GetURL());
+  EXPECT_EQ(GURL(kAboutBlankURL), controller().GetActiveEntry()->GetURL());
 }
 
 // Create a full screen popup RenderWidgetHost and View.
@@ -161,8 +161,8 @@ TEST_F(RenderViewHostTest, StartDragging) {
   drop_data.url = file_url;
   drop_data.html_base_url = file_url;
   test_rvh()->TestOnStartDragging(drop_data);
-  EXPECT_EQ(GURL("about:blank"), delegate_view.drag_url());
-  EXPECT_EQ(GURL("about:blank"), delegate_view.html_base_url());
+  EXPECT_EQ(GURL(kAboutBlankURL), delegate_view.drag_url());
+  EXPECT_EQ(GURL(kAboutBlankURL), delegate_view.html_base_url());
 
   GURL http_url = GURL("http://www.domain.com/index.html");
   drop_data.url = http_url;
diff --git a/content/browser/renderer_host/render_widget_host_view_browsertest.cc b/content/browser/renderer_host/render_widget_host_view_browsertest.cc
index 7809132..2fba9b9 100644
--- a/content/browser/renderer_host/render_widget_host_view_browsertest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_browsertest.cc
@@ -16,6 +16,7 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/url_constants.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/shell/shell.h"
 #include "content/test/content_browser_test.h"
@@ -270,7 +271,7 @@ class NonCompositingRenderWidgetHostViewBrowserTest
   }
 
   virtual GURL TestUrl() {
-    return GURL("about:blank");
+    return GURL(kAboutBlankURL);
   }
 
   virtual bool SetUpSourceSurface(const char* wait_message) OVERRIDE {
diff --git a/content/browser/session_history_browsertest.cc b/content/browser/session_history_browsertest.cc
index 6e2f3bf..d0bd950 100644
--- a/content/browser/session_history_browsertest.cc
+++ b/content/browser/session_history_browsertest.cc
@@ -164,10 +164,10 @@ IN_PROC_BROWSER_TEST_F(SessionHistoryTest, BasicBackForward) {
   EXPECT_EQ("bot1", GetTabTitle());
 
   GoBack();
-  EXPECT_EQ("about:blank", GetTabTitle());
+  EXPECT_EQ(std::string(kAboutBlankURL), GetTabTitle());
 
   ASSERT_FALSE(CanGoBack());
-  EXPECT_EQ("about:blank", GetTabTitle());
+  EXPECT_EQ(std::string(kAboutBlankURL), GetTabTitle());
 
   GoForward();
   EXPECT_EQ("bot1", GetTabTitle());
@@ -203,7 +203,7 @@ IN_PROC_BROWSER_TEST_F(SessionHistoryTest, FrameBackForward) {
   EXPECT_EQ(frames, GetTabURL());
 
   GoBack();
-  EXPECT_EQ("about:blank", GetTabTitle());
+  EXPECT_EQ(std::string(kAboutBlankURL), GetTabTitle());
   EXPECT_EQ(GURL(kAboutBlankURL), GetTabURL());
 
   GoForward();
@@ -400,10 +400,10 @@ IN_PROC_BROWSER_TEST_F(SessionHistoryTest, JavascriptHistory) {
   // history is [blank, bot1, bot2, *bot3]
 
   JavascriptGo("-3");
-  EXPECT_EQ("about:blank", GetTabTitle());
+  EXPECT_EQ(std::string(kAboutBlankURL), GetTabTitle());
 
   ASSERT_FALSE(CanGoBack());
-  EXPECT_EQ("about:blank", GetTabTitle());
+  EXPECT_EQ(std::string(kAboutBlankURL), GetTabTitle());
 
   JavascriptGo("1");
   EXPECT_EQ("bot1", GetTabTitle());
@@ -419,10 +419,10 @@ IN_PROC_BROWSER_TEST_F(SessionHistoryTest, JavascriptHistory) {
   EXPECT_EQ("bot1", GetTabTitle());
 
   JavascriptGo("-1");
-  EXPECT_EQ("about:blank", GetTabTitle());
+  EXPECT_EQ(std::string(kAboutBlankURL), GetTabTitle());
 
   ASSERT_FALSE(CanGoBack());
-  EXPECT_EQ("about:blank", GetTabTitle());
+  EXPECT_EQ(std::string(kAboutBlankURL), GetTabTitle());
 
   JavascriptGo("1");
   EXPECT_EQ("bot1", GetTabTitle());
diff --git a/content/browser/web_contents/navigation_controller_impl_unittest.cc b/content/browser/web_contents/navigation_controller_impl_unittest.cc
index a1904d0..6af4a55 100644
--- a/content/browser/web_contents/navigation_controller_impl_unittest.cc
+++ b/content/browser/web_contents/navigation_controller_impl_unittest.cc
@@ -34,6 +34,7 @@
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/page_state.h"
+#include "content/public/common/url_constants.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_notification_tracker.h"
 #include "content/public/test/test_utils.h"
@@ -506,7 +507,7 @@ TEST_F(NavigationControllerTest, LoadURLWithParams) {
   load_params.load_type = NavigationController::LOAD_TYPE_DEFAULT;
   load_params.is_renderer_initiated = true;
   load_params.override_user_agent = NavigationController::UA_OVERRIDE_TRUE;
-  load_params.transferred_global_request_id = GlobalRequestID(2,3);
+  load_params.transferred_global_request_id = GlobalRequestID(2, 3);
 
   controller.LoadURLWithParams(load_params);
   NavigationEntryImpl* entry =
@@ -527,7 +528,7 @@ TEST_F(NavigationControllerTest, LoadURLWithExtraParams_Data) {
       GURL("data:text/html,dataurl"));
   load_params.load_type = NavigationController::LOAD_TYPE_DATA;
   load_params.base_url_for_data_url = GURL("http://foo");
-  load_params.virtual_url_for_data_url = GURL("about:blank");
+  load_params.virtual_url_for_data_url = GURL(kAboutBlankURL);
   load_params.override_user_agent = NavigationController::UA_OVERRIDE_FALSE;
 
   controller.LoadURLWithParams(load_params);
@@ -867,7 +868,7 @@ TEST_F(NavigationControllerTest, LoadURL_IgnorePreemptsPending) {
   contents()->SetDelegate(delegate.get());
 
   // Without any navigations, the renderer starts at about:blank.
-  const GURL kExistingURL("about:blank");
+  const GURL kExistingURL(kAboutBlankURL);
 
   // Now make a pending new navigation.
   const GURL kNewURL("http://eh");
@@ -1160,7 +1161,7 @@ TEST_F(NavigationControllerTest, Reload_GeneratesNewPage) {
 
 class TestNavigationObserver : public RenderViewHostObserver {
  public:
-  TestNavigationObserver(RenderViewHost* render_view_host)
+  explicit TestNavigationObserver(RenderViewHost* render_view_host)
       : RenderViewHostObserver(render_view_host) {
   }
 
@@ -3524,7 +3525,7 @@ TEST_F(NavigationControllerTest, ClearFaviconOnRedirect) {
   EXPECT_FALSE(DoImagesMatch(kDefaultFavicon, entry->GetFavicon().image));
 
   test_rvh()->SendNavigateWithTransition(
-      0, // same page ID.
+      0,  // same page ID.
       kPageWithoutFavicon,
       PAGE_TRANSITION_CLIENT_REDIRECT);
   EXPECT_EQ(1U, navigation_entry_committed_counter_);
diff --git a/content/browser/web_contents/web_contents_impl_unittest.cc b/content/browser/web_contents/web_contents_impl_unittest.cc
index 1777d72..aded7ae 100644
--- a/content/browser/web_contents/web_contents_impl_unittest.cc
+++ b/content/browser/web_contents/web_contents_impl_unittest.cc
@@ -17,7 +17,6 @@
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
-#include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_ui_controller.h"
@@ -42,10 +41,9 @@ class WebContentsImplTestWebUIControllerFactory
  public:
   virtual WebUIController* CreateWebUIControllerForURL(
       WebUI* web_ui, const GURL& url) const OVERRIDE {
-   if (!UseWebUI(url))
-     return NULL;
-
-   return new WebUIController(web_ui);
+    if (!UseWebUI(url))
+      return NULL;
+    return new WebUIController(web_ui);
   }
 
   virtual WebUI::TypeID GetWebUIType(BrowserContext* browser_context,
@@ -73,7 +71,7 @@ class TestInterstitialPage;
 
 class TestInterstitialPageDelegate : public InterstitialPageDelegate {
  public:
-  TestInterstitialPageDelegate(TestInterstitialPage* interstitial_page)
+  explicit TestInterstitialPageDelegate(TestInterstitialPage* interstitial_page)
       : interstitial_page_(interstitial_page) {}
   virtual void CommandReceived(const std::string& command) OVERRIDE;
   virtual std::string GetHTMLContents() OVERRIDE { return std::string(); }
@@ -271,7 +269,7 @@ class WebContentsImplTest : public RenderViewHostImplTestHarness {
 
 class TestWebContentsObserver : public WebContentsObserver {
  public:
-  TestWebContentsObserver(WebContents* contents)
+  explicit TestWebContentsObserver(WebContents* contents)
       : WebContentsObserver(contents) {
   }
   virtual ~TestWebContentsObserver() {}
@@ -2110,7 +2108,7 @@ TEST_F(WebContentsImplTest, FilterURLs) {
 
   // A navigation to about:whatever should always look like a navigation to
   // about:blank
-  GURL url_normalized("about:blank");
+  GURL url_normalized(kAboutBlankURL);
   GURL url_from_ipc("about:whatever");
 
   // We navigate the test WebContents to about:blank, since NavigateAndCommit
diff --git a/content/renderer/cpp_bound_class_unittest.cc b/content/renderer/cpp_bound_class_unittest.cc
index 7b96193..29c2fd4 100644
--- a/content/renderer/cpp_bound_class_unittest.cc
+++ b/content/renderer/cpp_bound_class_unittest.cc
@@ -7,6 +7,7 @@
 // the binding from the outside by loading JS into the shell.
 
 #include "base/strings/utf_string_conversions.h"
+#include "content/public/common/url_constants.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "content/public/test/render_view_test.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
@@ -69,7 +70,7 @@ class TestObserver : public RenderViewObserver {
   CppBindingExampleWithOptionalFallback example_bound_class_;
 };
 
-}  // namespace anonymous
+}  // namespace
 
 class CppBoundClassTest : public RenderViewTest {
  public:
@@ -82,7 +83,7 @@ class CppBoundClassTest : public RenderViewTest {
 
     WebKit::WebURLRequest url_request;
     url_request.initialize();
-    url_request.setURL(GURL("about:blank"));
+    url_request.setURL(GURL(kAboutBlankURL));
 
     GetMainFrame()->loadRequest(url_request);
     ProcessPendingMessages();
diff --git a/content/renderer/resource_fetcher_browsertest.cc b/content/renderer/resource_fetcher_browsertest.cc
index e8c448d..a96bbf5 100644
--- a/content/renderer/resource_fetcher_browsertest.cc
+++ b/content/renderer/resource_fetcher_browsertest.cc
@@ -10,6 +10,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/timer/timer.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/url_constants.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/shell.h"
@@ -217,7 +218,7 @@ class ResourceFetcherTests : public ContentBrowserTest {
 // If this flakes, use http://crbug.com/51622.
 IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, ResourceFetcherDownload) {
   // Need to spin up the renderer.
-  NavigateToURL(shell(), GURL("about:blank"));
+  NavigateToURL(shell(), GURL(kAboutBlankURL));
 
   ASSERT_TRUE(test_server()->Start());
   GURL url(test_server()->GetURL("files/simple_page.html"));
@@ -229,7 +230,7 @@ IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, ResourceFetcherDownload) {
 
 IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, ResourceFetcher404) {
   // Need to spin up the renderer.
-  NavigateToURL(shell(), GURL("about:blank"));
+  NavigateToURL(shell(), GURL(kAboutBlankURL));
 
   // Test 404 response.
   ASSERT_TRUE(test_server()->Start());
@@ -243,7 +244,7 @@ IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, ResourceFetcher404) {
 // If this flakes, use http://crbug.com/51622.
 IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, ResourceFetcherDidFail) {
   // Need to spin up the renderer.
-  NavigateToURL(shell(), GURL("about:blank"));
+  NavigateToURL(shell(), GURL(kAboutBlankURL));
 
   PostTaskToInProcessRendererAndWait(
         base::Bind(&ResourceFetcherTests::ResourceFetcherDidFailOnRenderer,
@@ -252,7 +253,7 @@ IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, ResourceFetcherDidFail) {
 
 IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, ResourceFetcherTimeout) {
   // Need to spin up the renderer.
-  NavigateToURL(shell(), GURL("about:blank"));
+  NavigateToURL(shell(), GURL(kAboutBlankURL));
 
   // Grab a page that takes at least 1 sec to respond, but set the fetcher to
   // timeout in 0 sec.
@@ -266,7 +267,7 @@ IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, ResourceFetcherTimeout) {
 
 IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, ResourceFetcherDeletedInCallback) {
   // Need to spin up the renderer.
-  NavigateToURL(shell(), GURL("about:blank"));
+  NavigateToURL(shell(), GURL(kAboutBlankURL));
 
   // Grab a page that takes at least 1 sec to respond, but set the fetcher to
   // timeout in 0 sec.
diff --git a/content/shell/renderer/webkit_test_runner.cc b/content/shell/renderer/webkit_test_runner.cc
index bb1eb36..a001300 100644
--- a/content/shell/renderer/webkit_test_runner.cc
+++ b/content/shell/renderer/webkit_test_runner.cc
@@ -19,6 +19,7 @@
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
+#include "content/public/common/url_constants.h"
 #include "content/public/renderer/history_item_serialization.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/render_view_visitor.h"
@@ -117,7 +118,6 @@ void CopyCanvasToBitmap(SkCanvas* canvas,  SkBitmap* snapshot) {
   // Only the expected PNGs for Mac have a valid alpha channel.
   MakeBitmapOpaque(snapshot);
 #endif
-
 }
 
 class SyncNavigationStateVisitor : public RenderViewVisitor {
@@ -155,6 +155,7 @@ class ProxyToRenderViewVisitor : public RenderViewVisitor {
     }
     return true;
   }
+
  private:
   WebTestProxyBase* proxy_;
   RenderView* render_view_;
@@ -164,15 +165,15 @@ class ProxyToRenderViewVisitor : public RenderViewVisitor {
 
 class NavigateAwayVisitor : public RenderViewVisitor {
  public:
-  NavigateAwayVisitor(RenderView* main_render_view)
+  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("about:blank")));
+    render_view->GetWebView()->mainFrame()->loadRequest(
+        WebURLRequest(GURL(kAboutBlankURL)));
     return true;
   }
 
@@ -670,8 +671,8 @@ void WebKitTestRunner::OnReset() {
   Reset();
   // Navigating to about:blank will make sure that no new loads are initiated
   // by the renderer.
-  render_view()->GetWebView()->mainFrame()
-      ->loadRequest(WebURLRequest(GURL("about:blank")));
+  render_view()->GetWebView()->mainFrame()->loadRequest(
+      WebURLRequest(GURL(kAboutBlankURL)));
   Send(new ShellViewHostMsg_ResetDone(routing_id()));
 }
 
diff --git a/content/shell/shell_application_mac.mm b/content/shell/shell_application_mac.mm
index 7910dfe..8300ebf 100644
--- a/content/shell/shell_application_mac.mm
+++ b/content/shell/shell_application_mac.mm
@@ -5,6 +5,7 @@
 #include "content/shell/shell_application_mac.h"
 
 #include "base/auto_reset.h"
+#include "content/public/common/url_constants.h"
 #include "content/shell/shell.h"
 #include "content/shell/shell_browser_context.h"
 #include "content/shell/shell_content_browser_client.h"
@@ -29,7 +30,7 @@
   content::ShellBrowserContext* browserContext =
       content::ShellContentBrowserClient::Get()->browser_context();
   content::Shell::CreateNewWindow(browserContext,
-                                  GURL("about:blank"),
+                                  GURL(content::kAboutBlankURL),
                                   NULL,
                                   MSG_ROUTING_NONE,
                                   gfx::Size());