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

content/browser/session_history_browsertest.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 "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
@@ skipping 34 matching lines @@
 
 class SessionHistoryTest : public ContentBrowserTest {
  protected:
   SessionHistoryTest() {}
 
   virtual void SetUpOnMainThread() OVERRIDE {
     ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
     embedded_test_server()->RegisterRequestHandler(
         base::Bind(&HandleEchoTitleRequest, "/echotitle"));
 
-    NavigateToURL(shell(), GURL(kAboutBlankURL));
+    NavigateToURL(shell(), GURL(url::kAboutBlankURL));
   }
 
   // Simulate clicking a link.  Only works on the frames.html testserver page.
   void ClickLink(std::string node_id) {
     GURL url("javascript:clickLink('" + node_id + "')");
     NavigateToURL(shell(), url);
   }
 
   // Simulate filling in form data.  Only works on the frames.html page with
   // subframe = form.html, and on form.html itself.
@@ skipping 91 matching lines @@
 
   // history is [blank, bot1, *bot3]
 
   ASSERT_FALSE(CanGoForward());
   EXPECT_EQ("bot3", GetTabTitle());
 
   GoBack();
   EXPECT_EQ("bot1", GetTabTitle());
 
   GoBack();
-  EXPECT_EQ(std::string(kAboutBlankURL), GetTabTitle());
+  EXPECT_EQ(std::string(url::kAboutBlankURL), GetTabTitle());
 
   ASSERT_FALSE(CanGoBack());
-  EXPECT_EQ(std::string(kAboutBlankURL), GetTabTitle());
+  EXPECT_EQ(std::string(url::kAboutBlankURL), GetTabTitle());
 
   GoForward();
   EXPECT_EQ("bot1", GetTabTitle());
 
   GoForward();
   EXPECT_EQ("bot3", GetTabTitle());
 }
 
 // Test that back/forward works when navigating in subframes.
 // If this flakes, use http://crbug.com/48833
@@ skipping 15 matching lines @@
 
   GoBack();
   EXPECT_EQ("bot2", GetTabTitle());
   EXPECT_EQ(frames, GetTabURL());
 
   GoBack();
   EXPECT_EQ("bot1", GetTabTitle());
   EXPECT_EQ(frames, GetTabURL());
 
   GoBack();
-  EXPECT_EQ(std::string(kAboutBlankURL), GetTabTitle());
-  EXPECT_EQ(GURL(kAboutBlankURL), GetTabURL());
+  EXPECT_EQ(std::string(url::kAboutBlankURL), GetTabTitle());
+  EXPECT_EQ(GURL(url::kAboutBlankURL), GetTabURL());
 
   GoForward();
   EXPECT_EQ("bot1", GetTabTitle());
   EXPECT_EQ(frames, GetTabURL());
 
   GoForward();
   EXPECT_EQ("bot2", GetTabTitle());
   EXPECT_EQ(frames, GetTabURL());
 
   ClickLink("abot1");
@@ skipping 175 matching lines @@
 
   JavascriptGo("-1");
   EXPECT_EQ("bot1", GetTabTitle());
 
   JavascriptGo("2");
   EXPECT_EQ("bot3", GetTabTitle());
 
   // history is [blank, bot1, bot2, *bot3]
 
   JavascriptGo("-3");
-  EXPECT_EQ(std::string(kAboutBlankURL), GetTabTitle());
+  EXPECT_EQ(std::string(url::kAboutBlankURL), GetTabTitle());
 
   ASSERT_FALSE(CanGoBack());
-  EXPECT_EQ(std::string(kAboutBlankURL), GetTabTitle());
+  EXPECT_EQ(std::string(url::kAboutBlankURL), GetTabTitle());
 
   JavascriptGo("1");
   EXPECT_EQ("bot1", GetTabTitle());
 
   ASSERT_NO_FATAL_FAILURE(NavigateAndCheckTitle("bot3.html", "bot3"));
 
   // history is [blank, bot1, *bot3]
 
   ASSERT_FALSE(CanGoForward());
   EXPECT_EQ("bot3", GetTabTitle());
 
   JavascriptGo("-1");
   EXPECT_EQ("bot1", GetTabTitle());
 
   JavascriptGo("-1");
-  EXPECT_EQ(std::string(kAboutBlankURL), GetTabTitle());
+  EXPECT_EQ(std::string(url::kAboutBlankURL), GetTabTitle());
 
   ASSERT_FALSE(CanGoBack());
-  EXPECT_EQ(std::string(kAboutBlankURL), GetTabTitle());
+  EXPECT_EQ(std::string(url::kAboutBlankURL), GetTabTitle());
 
   JavascriptGo("1");
   EXPECT_EQ("bot1", GetTabTitle());
 
   JavascriptGo("1");
   EXPECT_EQ("bot3", GetTabTitle());
 
   // TODO(creis): Test that JavaScript history navigations work across tab
   // types.  For example, load about:network in a tab, then a real page, then
   // try to go back and forward with JavaScript.  Bug 1136715.
@@ skipping 54 matching lines @@
   NavigateToURL(shell(), GetURL("title2.html"));
 
   ASSERT_TRUE(ExecuteScriptAndExtractInt(
       shell()->web_contents(),
       "domAutomationController.send(history.length)",
       &length));
   EXPECT_EQ(2, length);
 }
 
 }  // namespace content