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

content/browser/frame_host/render_frame_host_manager_browsertest.cc

 // Copyright 2013 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 <set>
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
@@ skipping 981 matching lines @@
 #if defined(THREAD_SANITIZER)
 #define MAYBE_BackForwardNotStale DISABLED_BackForwardNotStale
 #else
 #define MAYBE_BackForwardNotStale BackForwardNotStale
 #endif
 // Test for http://crbug.com/93427.  Ensure that cross-site navigations
 // do not cause back/forward navigations to be considered stale by the
 // renderer.
 IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest, MAYBE_BackForwardNotStale) {
   StartServer();
-  NavigateToURL(shell(), GURL(kAboutBlankURL));
+  NavigateToURL(shell(), GURL(url::kAboutBlankURL));
 
   // Visit a page on first site.
   NavigateToURL(shell(), test_server()->GetURL("files/title1.html"));
 
   // Visit three pages on second site.
   NavigateToURL(shell(), GetCrossSiteURL("files/title1.html"));
   NavigateToURL(shell(), GetCrossSiteURL("files/title2.html"));
   NavigateToURL(shell(), GetCrossSiteURL("files/title3.html"));
 
   // History is now [blank, A1, B1, B2, *B3].
@@ skipping 443 matching lines @@
   // Navigate to url1 and check bindings.
   NavigateToURL(new_shell, url1);
   // The navigation should have used the first SiteInstance, otherwise
   // |initial_rvh| did not have a chance to be used.
   EXPECT_EQ(new_web_contents->GetSiteInstance(), site_instance1);
   EXPECT_EQ(BINDINGS_POLICY_WEB_UI,
       new_web_contents->GetRenderViewHost()->GetEnabledBindings());
 }
 
 }  // namespace content