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

chrome/browser/ui/browser_tabrestore_browsertest.cc

 // Copyright 2014 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 "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_delegate.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ skipping 51 matching lines @@
   close_observer.Wait();
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserTabRestoreTest, RecentTabsMenuTabDisposition) {
   // Create tabs.
   CreateTestTabs(browser());
   EXPECT_EQ(3, browser()->tab_strip_model()->count());
 
   // Create a new browser.
   ui_test_utils::NavigateToURLWithDisposition(
-      browser(), GURL(content::kAboutBlankURL), NEW_WINDOW,
+      browser(),
+      GURL(url::kAboutBlankURL),
+      NEW_WINDOW,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
   BrowserList* active_browser_list =
       BrowserList::GetInstance(browser()->host_desktop_type());
   EXPECT_EQ(2u, active_browser_list->size());
 
   // Close the first browser.
   CloseBrowser(browser());
   EXPECT_EQ(1u, active_browser_list->size());
 
   // Restore tabs using the browser's recent tabs menu.
@@ skipping 13 matching lines @@
   CheckVisbility(browser->tab_strip_model(), 1);
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserTabRestoreTest, DelegateRestoreTabDisposition) {
   // Create tabs.
   CreateTestTabs(browser());
   EXPECT_EQ(3, browser()->tab_strip_model()->count());
 
   // Create a new browser.
   ui_test_utils::NavigateToURLWithDisposition(
-      browser(), GURL(content::kAboutBlankURL), NEW_WINDOW,
+      browser(),
+      GURL(url::kAboutBlankURL),
+      NEW_WINDOW,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
   BrowserList* active_browser_list =
       BrowserList::GetInstance(browser()->host_desktop_type());
   EXPECT_EQ(2u, active_browser_list->size());
 
   // Close the first browser.
   CloseBrowser(browser());
   EXPECT_EQ(1u, active_browser_list->size());
 
   // Check the browser has a delegated restore service.
@@ skipping 15 matching lines @@
   AwaitTabsReady(&queue, 2);
 
   // There should be 3 restored tabs in the new browser.
   EXPECT_EQ(2u, active_browser_list->size());
   browser = active_browser_list->get(1);
   EXPECT_EQ(3, browser->tab_strip_model()->count());
 
   // The middle tab only should have visible disposition.
   CheckVisbility(browser->tab_strip_model(), 1);
 }