Move about://-related constants from //content to //url

chrome/browser/ui/toolbar/toolbar_model_unittest.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 "chrome/browser/ui/toolbar/toolbar_model.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
@@ skipping 47 matching lines @@
   },
   {
     GURL("chrome-extension://monkey/balls.html"),
     base::ASCIIToUTF16("chrome-extension://monkey/balls.html"),
     base::ASCIIToUTF16("chrome-extension://monkey/balls.html"),
     base::string16(),
     false,
     true
   },
   {
-    GURL(content::kAboutBlankURL),
-    base::ASCIIToUTF16(content::kAboutBlankURL),
-    base::ASCIIToUTF16(content::kAboutBlankURL),
+    GURL(url::kAboutBlankURL),
+    base::ASCIIToUTF16(url::kAboutBlankURL),
+    base::ASCIIToUTF16(url::kAboutBlankURL),
     base::string16(),
     false,
     true
   },
   {
     GURL("http://searchurl/?q=tractor+supply"),
     base::ASCIIToUTF16("searchurl/?q=tractor+supply"),
     base::ASCIIToUTF16("searchurl/?q=tractor+supply"),
     base::string16(),
     false,
@@ skipping 165 matching lines @@
 }
 
 PopupToolbarModelTest::~PopupToolbarModelTest() {
 }
 
 // Actual tests ---------------------------------------------------------------
 
 // Test that we only replace URLs when query extraction and URL replacement
 // are enabled.
 TEST_F(ToolbarModelTest, ShouldDisplayURL_QueryExtraction) {
-  AddTab(browser(), GURL(content::kAboutBlankURL));
+  AddTab(browser(), GURL(url::kAboutBlankURL));
 
   // Before we enable instant extended, query extraction is disabled.
   EXPECT_FALSE(chrome::IsQueryExtractionEnabled())
       << "This test expects query extraction to be disabled.";
   for (size_t i = 0; i < arraysize(test_items); ++i) {
     const TestItem& test_item = test_items[i];
     NavigateAndCheckText(test_item.url,
                          test_item.expected_text_url_replacement_inactive,
                          false, test_item.should_display_url);
   }
@@ skipping 16 matching lines @@
     NavigateAndCheckText(test_item.url,
                          test_item.expected_text_url_replacement_inactive,
                          false, test_item.should_display_url);
   }
 }
 
 // Test that we remove or replace URLs appropriately when the origin chip is
 // enabled.
 TEST_F(ToolbarModelTest, ShouldDisplayURL_OriginChip) {
   EnableOriginChipFieldTrial();
-  AddTab(browser(), GURL(content::kAboutBlankURL));
+  AddTab(browser(), GURL(url::kAboutBlankURL));
 
   // Check each case with the origin chip enabled but query extraction disabled.
   EXPECT_TRUE(chrome::ShouldDisplayOriginChip());
   EXPECT_FALSE(chrome::IsQueryExtractionEnabled());
   for (size_t i = 0; i < arraysize(test_items); ++i) {
     const TestItem& test_item = test_items[i];
     NavigateAndCheckText(test_item.url, base::string16(), false,
                          test_item.should_display_url);
   }
 
@@ skipping 14 matching lines @@
     const TestItem& test_item = test_items[i];
     NavigateAndCheckText(test_item.url,
                          test_item.expected_text_url_replacement_inactive,
                          false, test_item.should_display_url);
   }
 }
 
  // Verify that search terms are extracted while the page is loading.
 TEST_F(ToolbarModelTest, SearchTermsWhileLoading) {
   chrome::EnableQueryExtractionForTesting();
-  AddTab(browser(), GURL(content::kAboutBlankURL));
+  AddTab(browser(), GURL(url::kAboutBlankURL));
 
   // While loading, we should be willing to extract search terms.
   content::NavigationController* controller =
       &browser()->tab_strip_model()->GetWebContentsAt(0)->GetController();
   controller->LoadURL(GURL("https://google.com/search?q=tractor+supply&espv=1"),
                       content::Referrer(), content::PAGE_TRANSITION_LINK,
                       std::string());
   ToolbarModel* toolbar_model = browser()->toolbar_model();
   controller->GetVisibleEntry()->GetSSL().security_style =
       content::SECURITY_STYLE_UNKNOWN;
   EXPECT_TRUE(toolbar_model->WouldPerformSearchTermReplacement(false));
 
   // When done loading, we shouldn't extract search terms if we didn't get an
   // authenticated connection.
   CommitPendingLoad(controller);
   controller->GetVisibleEntry()->GetSSL().security_style =
       content::SECURITY_STYLE_UNKNOWN;
   EXPECT_FALSE(toolbar_model->WouldPerformSearchTermReplacement(false));
 }
 
 // When the Google base URL is overridden on the command line, we should extract
 // search terms from URLs that start with that base URL even when they're not
 // secure.
 TEST_F(ToolbarModelTest, GoogleBaseURL) {
   chrome::EnableQueryExtractionForTesting();
-  AddTab(browser(), GURL(content::kAboutBlankURL));
+  AddTab(browser(), GURL(url::kAboutBlankURL));
 
   // If the Google base URL wasn't specified on the command line, then if it's
   // HTTP, we should not extract search terms.
   UIThreadSearchTermsData::SetGoogleBaseURL("http://www.foo.com/");
   NavigateAndCheckText(
       GURL("http://www.foo.com/search?q=tractor+supply&espv=1"),
       base::ASCIIToUTF16("www.foo.com/search?q=tractor+supply&espv=1"), false,
       true);
 
   // The same URL, when specified on the command line, should allow search term
   // extraction.
   UIThreadSearchTermsData::SetGoogleBaseURL(std::string());
   CommandLine::ForCurrentProcess()->AppendSwitchASCII(switches::kGoogleBaseURL,
                                                       "http://www.foo.com/");
   NavigateAndCheckText(
       GURL("http://www.foo.com/search?q=tractor+supply&espv=1"),
       base::ASCIIToUTF16("tractor supply"), true, true);
 }
 
 // Popup windows don't have an origin chip, so test that URL display in a popup
 // ignores whether the origin chip is enabled and only respects the query
 // extraction flag.
 TEST_F(PopupToolbarModelTest, ShouldDisplayURL) {
-  AddTab(browser(), GURL(content::kAboutBlankURL));
+  AddTab(browser(), GURL(url::kAboutBlankURL));
 
   // Check with neither query extraction nor the origin chip enabled.
   EXPECT_FALSE(chrome::ShouldDisplayOriginChip());
   EXPECT_FALSE(chrome::IsQueryExtractionEnabled());
   for (size_t i = 0; i < arraysize(test_items); ++i) {
     const TestItem& test_item = test_items[i];
     NavigateAndCheckText(test_item.url,
                          test_item.expected_text_url_replacement_inactive,
                          false, test_item.should_display_url);
   }
@@ skipping 24 matching lines @@
 
   // Disabling URL replacement should reset to only showing URLs.
   browser()->toolbar_model()->set_url_replacement_enabled(false);
   for (size_t i = 0; i < arraysize(test_items); ++i) {
     const TestItem& test_item = test_items[i];
     NavigateAndCheckText(test_item.url,
                          test_item.expected_text_url_replacement_inactive,
                          false, test_item.should_display_url);
   }
 }