Replace string16 with base::string16.

chrome/browser/autocomplete/builtin_provider.cc

Index: chrome/browser/autocomplete/builtin_provider.cc
diff --git a/chrome/browser/autocomplete/builtin_provider.cc b/chrome/browser/autocomplete/builtin_provider.cc
index 533f1178bffcde82e0e20d125261c760b8d92f48..f66be0735a6c83b2581328eeaddc61bbebf42d7b 100644
--- a/chrome/browser/autocomplete/builtin_provider.cc
+++ b/chrome/browser/autocomplete/builtin_provider.cc
@@ -47,8 +47,8 @@ BuiltinProvider::BuiltinProvider(AutocompleteProviderListener* listener,
   for (std::vector<std::string>::iterator i(builtins.begin());
        i != builtins.end(); ++i)
     builtins_.push_back(ASCIIToUTF16(*i));
-  string16 settings(ASCIIToUTF16(chrome::kChromeUISettingsHost) +
-                    ASCIIToUTF16("/"));
+  base::string16 settings(ASCIIToUTF16(chrome::kChromeUISettingsHost) +
+                          ASCIIToUTF16("/"));
   for (size_t i = 0; i < arraysize(kChromeSettingsSubPages); i++)
     builtins_.push_back(settings + ASCIIToUTF16(kChromeSettingsSubPages[i]));
 }
@@ -61,15 +61,15 @@ void BuiltinProvider::Start(const AutocompleteInput& input,
       (input.type() == AutocompleteInput::QUERY))
     return;
 
-  const string16 kAbout = ASCIIToUTF16(chrome::kAboutScheme) +
+  const base::string16 kAbout = ASCIIToUTF16(chrome::kAboutScheme) +
       ASCIIToUTF16(content::kStandardSchemeSeparator);
-  const string16 kChrome = ASCIIToUTF16(chrome::kChromeUIScheme) +
+  const base::string16 kChrome = ASCIIToUTF16(chrome::kChromeUIScheme) +
       ASCIIToUTF16(content::kStandardSchemeSeparator);
 
   const int kUrl = ACMatchClassification::URL;
   const int kMatch = kUrl | ACMatchClassification::MATCH;
 
-  string16 text = input.text();
+  base::string16 text = input.text();
   bool starting_chrome = StartsWith(kChrome, text, false);
   if (starting_chrome || StartsWith(kAbout, text, false)) {
     ACMatchClassifications styles;
@@ -82,9 +82,12 @@ void BuiltinProvider::Start(const AutocompleteInput& input,
     if (highlight)
       styles.push_back(ACMatchClassification(offset, kUrl));
     // Include some common builtin chrome URLs as the user types the scheme.
-    AddMatch(ASCIIToUTF16(chrome::kChromeUIChromeURLsURL), string16(), styles);
-    AddMatch(ASCIIToUTF16(chrome::kChromeUISettingsURL), string16(), styles);
-    AddMatch(ASCIIToUTF16(chrome::kChromeUIVersionURL), string16(), styles);
+    AddMatch(ASCIIToUTF16(chrome::kChromeUIChromeURLsURL), base::string16(),
+             styles);
+    AddMatch(ASCIIToUTF16(chrome::kChromeUISettingsURL), base::string16(),
+             styles);
+    AddMatch(ASCIIToUTF16(chrome::kChromeUIVersionURL), base::string16(),
+             styles);
   } else {
     // Match input about: or chrome: URL input against builtin chrome URLs.
     GURL url = URLFixerUpper::FixupURL(UTF16ToUTF8(text), std::string());
@@ -93,7 +96,7 @@ void BuiltinProvider::Start(const AutocompleteInput& input,
     if (url.SchemeIs(chrome::kChromeUIScheme) && url.has_host() &&
         !url.has_query() && !url.has_ref()) {
       // Include the path for sub-pages (e.g. "chrome://settings/browser").
-      string16 host_and_path = UTF8ToUTF16(url.host() + url.path());
+      base::string16 host_and_path = UTF8ToUTF16(url.host() + url.path());
       base::TrimString(host_and_path, ASCIIToUTF16("/").c_str(),
                        &host_and_path);
       size_t match_length = kChrome.length() + host_and_path.length();
@@ -103,7 +106,7 @@ void BuiltinProvider::Start(const AutocompleteInput& input,
           ACMatchClassifications styles;
           // Highlight the "chrome://" scheme, even for input "about:foo".
           styles.push_back(ACMatchClassification(0, kMatch));
-          string16 match_string = kChrome + *i;
+          base::string16 match_string = kChrome + *i;
           if (match_string.length() > match_length)
             styles.push_back(ACMatchClassification(match_length, kUrl));
           AddMatch(match_string, match_string.substr(match_length), styles);
@@ -125,8 +128,8 @@ void BuiltinProvider::Start(const AutocompleteInput& input,
 
 BuiltinProvider::~BuiltinProvider() {}
 
-void BuiltinProvider::AddMatch(const string16& match_string,
-                               const string16& inline_completion,
+void BuiltinProvider::AddMatch(const base::string16& match_string,
+                               const base::string16& inline_completion,
                                const ACMatchClassifications& styles) {
   AutocompleteMatch match(this, kRelevance, false,
                           AutocompleteMatchType::NAVSUGGEST);