Update some uses of UTF conversions in chrome/browser to use the base:: namespace.

chrome/browser/autocomplete/builtin_provider.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/autocomplete/builtin_provider.h"
 
 #include <algorithm>
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 28 matching lines @@
 BuiltinProvider::BuiltinProvider(AutocompleteProviderListener* listener,
                                  Profile* profile)
     : AutocompleteProvider(listener, profile,
           AutocompleteProvider::TYPE_BUILTIN) {
   std::vector<std::string> builtins(
       chrome::kChromeHostURLs,
       chrome::kChromeHostURLs + chrome::kNumberOfChromeHostURLs);
   std::sort(builtins.begin(), builtins.end());
   for (std::vector<std::string>::iterator i(builtins.begin());
        i != builtins.end(); ++i)
-    builtins_.push_back(ASCIIToUTF16(*i));
-  base::string16 settings(ASCIIToUTF16(chrome::kChromeUISettingsHost) +
-                          ASCIIToUTF16("/"));
-  for (size_t i = 0; i < arraysize(kChromeSettingsSubPages); i++)
-    builtins_.push_back(settings + ASCIIToUTF16(kChromeSettingsSubPages[i]));
+    builtins_.push_back(base::ASCIIToUTF16(*i));
+  base::string16 settings(base::ASCIIToUTF16(chrome::kChromeUISettingsHost) +
+                          base::ASCIIToUTF16("/"));
+  for (size_t i = 0; i < arraysize(kChromeSettingsSubPages); i++) {
+    builtins_.push_back(
+        settings + base::ASCIIToUTF16(kChromeSettingsSubPages[i]));
+  }
 }
 
 void BuiltinProvider::Start(const AutocompleteInput& input,
                             bool minimal_changes) {
   matches_.clear();
   if ((input.type() == AutocompleteInput::INVALID) ||
       (input.type() == AutocompleteInput::FORCED_QUERY) ||
       (input.type() == AutocompleteInput::QUERY))
     return;
 
-  const base::string16 kAbout = ASCIIToUTF16(chrome::kAboutScheme) +
-      ASCIIToUTF16(content::kStandardSchemeSeparator);
-  const base::string16 kChrome = ASCIIToUTF16(chrome::kChromeUIScheme) +
-      ASCIIToUTF16(content::kStandardSchemeSeparator);
+  const base::string16 kAbout = base::ASCIIToUTF16(chrome::kAboutScheme) +
+      base::ASCIIToUTF16(content::kStandardSchemeSeparator);
+  const base::string16 kChrome = base::ASCIIToUTF16(chrome::kChromeUIScheme) +
+      base::ASCIIToUTF16(content::kStandardSchemeSeparator);
 
   const int kUrl = ACMatchClassification::URL;
   const int kMatch = kUrl | ACMatchClassification::MATCH;
 
   base::string16 text = input.text();
   bool starting_chrome = StartsWith(kChrome, text, false);
   if (starting_chrome || StartsWith(kAbout, text, false)) {
     ACMatchClassifications styles;
     // Highlight the input portion matching "chrome://"; or if the user has
     // input "about:" (with optional slashes), highlight the whole "chrome://".
     const size_t kAboutSchemeLength = strlen(chrome::kAboutScheme);
     bool highlight = starting_chrome || text.length() > kAboutSchemeLength;
     styles.push_back(ACMatchClassification(0, highlight ? kMatch : kUrl));
     size_t offset = starting_chrome ? text.length() : kChrome.length();
     if (highlight)
       styles.push_back(ACMatchClassification(offset, kUrl));
     // Include some common builtin chrome URLs as the user types the scheme.
-    AddMatch(ASCIIToUTF16(chrome::kChromeUIChromeURLsURL), base::string16(),
-             styles);
-    AddMatch(ASCIIToUTF16(chrome::kChromeUISettingsURL), base::string16(),
-             styles);
-    AddMatch(ASCIIToUTF16(chrome::kChromeUIVersionURL), base::string16(),
-             styles);
+    AddMatch(base::ASCIIToUTF16(chrome::kChromeUIChromeURLsURL),
+             base::string16(), styles);
+    AddMatch(base::ASCIIToUTF16(chrome::kChromeUISettingsURL),
+             base::string16(), styles);
+    AddMatch(base::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());
+    GURL url = URLFixerUpper::FixupURL(base::UTF16ToUTF8(text), std::string());
     // BuiltinProvider doesn't know how to suggest valid ?query or #fragment
     // extensions to chrome: URLs.
     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").
-      base::string16 host_and_path = UTF8ToUTF16(url.host() + url.path());
-      base::TrimString(host_and_path, ASCIIToUTF16("/").c_str(),
+      base::string16 host_and_path = base::UTF8ToUTF16(url.host() + url.path());
+      base::TrimString(host_and_path, base::ASCIIToUTF16("/").c_str(),
                        &host_and_path);
       size_t match_length = kChrome.length() + host_and_path.length();
       for (Builtins::const_iterator i(builtins_.begin());
           (i != builtins_.end()) && (matches_.size() < kMaxMatches); ++i) {
         if (StartsWith(*i, host_and_path, false)) {
           ACMatchClassifications styles;
           // Highlight the "chrome://" scheme, even for input "about:foo".
           styles.push_back(ACMatchClassification(0, kMatch));
           base::string16 match_string = kChrome + *i;
           if (match_string.length() > match_length)
@@ skipping 22 matching lines @@
                                const ACMatchClassifications& styles) {
   AutocompleteMatch match(this, kRelevance, false,
                           AutocompleteMatchType::NAVSUGGEST);
   match.fill_into_edit = match_string;
   match.inline_autocompletion = inline_completion;
   match.destination_url = GURL(match_string);
   match.contents = match_string;
   match.contents_class = styles;
   matches_.push_back(match);
 }