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

chrome/browser/search_engines/template_url.cc

Index: chrome/browser/search_engines/template_url.cc
diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc
index 7f9d93fa07baa19d91db34cc42271db44f327c3d..a4f205c3636faa26ee1c680c4bc52880d3604097 100644
--- a/chrome/browser/search_engines/template_url.cc
+++ b/chrome/browser/search_engines/template_url.cc
@@ -130,7 +130,7 @@ bool TryEncoding(const base::string16& terms,
   if (!base::UTF16ToCodepage(terms, encoding,
       base::OnStringConversionError::SKIP, &encoded_terms))
     return false;
-  *escaped_terms = UTF8ToUTF16(is_in_query ?
+  *escaped_terms = base::UTF8ToUTF16(is_in_query ?
       net::EscapeQueryParamValue(encoded_terms, true) :
       net::EscapePath(encoded_terms));
   if (original_query.empty())
@@ -139,8 +139,8 @@ bool TryEncoding(const base::string16& terms,
   if (!base::UTF16ToCodepage(original_query, encoding,
       base::OnStringConversionError::SKIP, &encoded_original_query))
     return false;
-  *escaped_original_query =
-      UTF8ToUTF16(net::EscapeQueryParamValue(encoded_original_query, true));
+  *escaped_original_query = base::UTF8ToUTF16(
+      net::EscapeQueryParamValue(encoded_original_query, true));
   return true;
 }
 
@@ -379,14 +379,14 @@ bool TemplateURLRef::IsValidUsingTermsData(
 
 base::string16 TemplateURLRef::DisplayURL() const {
   ParseIfNecessary();
-  base::string16 result(UTF8ToUTF16(GetURL()));
+  base::string16 result(base::UTF8ToUTF16(GetURL()));
   if (valid_ && !replacements_.empty()) {
     ReplaceSubstringsAfterOffset(&result, 0,
-                                 ASCIIToUTF16(kSearchTermsParameterFull),
-                                 ASCIIToUTF16(kDisplaySearchTerms));
+                                 base::ASCIIToUTF16(kSearchTermsParameterFull),
+                                 base::ASCIIToUTF16(kDisplaySearchTerms));
     ReplaceSubstringsAfterOffset(&result, 0,
-        ASCIIToUTF16(kGoogleUnescapedSearchTermsParameterFull),
-        ASCIIToUTF16(kDisplayUnescapedSearchTerms));
+        base::ASCIIToUTF16(kGoogleUnescapedSearchTermsParameterFull),
+        base::ASCIIToUTF16(kDisplayUnescapedSearchTerms));
   }
   return result;
 }
@@ -395,13 +395,14 @@ base::string16 TemplateURLRef::DisplayURL() const {
 std::string TemplateURLRef::DisplayURLToURLRef(
     const base::string16& display_url) {
   base::string16 result = display_url;
-  ReplaceSubstringsAfterOffset(&result, 0, ASCIIToUTF16(kDisplaySearchTerms),
-                               ASCIIToUTF16(kSearchTermsParameterFull));
+  ReplaceSubstringsAfterOffset(&result, 0,
+                               base::ASCIIToUTF16(kDisplaySearchTerms),
+                               base::ASCIIToUTF16(kSearchTermsParameterFull));
   ReplaceSubstringsAfterOffset(
       &result, 0,
-      ASCIIToUTF16(kDisplayUnescapedSearchTerms),
-      ASCIIToUTF16(kGoogleUnescapedSearchTermsParameterFull));
-  return UTF16ToUTF8(result);
+      base::ASCIIToUTF16(kDisplayUnescapedSearchTerms),
+      base::ASCIIToUTF16(kGoogleUnescapedSearchTermsParameterFull));
+  return base::UTF16ToUTF8(result);
 }
 
 const std::string& TemplateURLRef::GetHost() const {
@@ -442,7 +443,7 @@ base::string16 TemplateURLRef::SearchTermToString16(
   // When nothing worked, just use the escaped text. We have no idea what the
   // encoding is. We need to substitute spaces for pluses ourselves since we're
   // not sending it through an unescaper.
-  result = UTF8ToUTF16(term);
+  result = base::UTF8ToUTF16(term);
   std::replace(result.begin(), result.end(), '+', ' ');
   return result;
 }
@@ -925,7 +926,7 @@ std::string TemplateURLRef::HandleReplacements(
         if (search_terms_args.accepted_suggestion >= 0 ||
             !search_terms_args.assisted_query_stats.empty()) {
           HandleReplacement(
-              "oq", UTF16ToUTF8(encoded_original_query), *i, &url);
+              "oq", base::UTF16ToUTF8(encoded_original_query), *i, &url);
         }
         break;
 
@@ -946,7 +947,7 @@ std::string TemplateURLRef::HandleReplacements(
         // NOTREACHED below.)
         base::string16 rlz_string = search_terms_data.GetRlzParameterValue();
         if (!rlz_string.empty()) {
-          HandleReplacement("rlz", UTF16ToUTF8(rlz_string), *i, &url);
+          HandleReplacement("rlz", base::UTF16ToUTF8(rlz_string), *i, &url);
         }
         break;
       }
@@ -992,7 +993,8 @@ std::string TemplateURLRef::HandleReplacements(
         break;
 
       case SEARCH_TERMS:
-        HandleReplacement(std::string(), UTF16ToUTF8(encoded_terms), *i, &url);
+        HandleReplacement(
+            std::string(), base::UTF16ToUTF8(encoded_terms), *i, &url);
         break;
 
       case GOOGLE_IMAGE_THUMBNAIL:
@@ -1050,7 +1052,7 @@ TemplateURLData::TemplateURLData()
       usage_count(0),
       prepopulate_id(0),
       sync_guid(base::GenerateGUID()),
-      keyword_(ASCIIToUTF16("dummy")),
+      keyword_(base::ASCIIToUTF16("dummy")),
       url_("x") {
 }
 
@@ -1132,7 +1134,7 @@ bool TemplateURL::SupportsReplacementUsingTermsData(
 
 bool TemplateURL::IsGoogleSearchURLWithReplaceableKeyword() const {
   return (GetType() == NORMAL) && url_ref_.HasGoogleBaseURLs() &&
-      google_util::IsGoogleHostname(UTF16ToUTF8(data_.keyword()),
+      google_util::IsGoogleHostname(base::UTF16ToUTF8(data_.keyword()),
                                     google_util::DISALLOW_SUBDOMAIN);
 }
 
@@ -1242,7 +1244,7 @@ bool TemplateURL::ReplaceSearchTermsInURL(
   std::string old_params((search_term_component == url_parse::Parsed::REF) ?
       url.ref() : url.query());
   std::string new_params(old_params, 0, search_terms_position.begin);
-  new_params += UTF16ToUTF8(search_terms_args.search_terms);
+  new_params += base::UTF16ToUTF8(search_terms_args.search_terms);
   new_params += old_params.substr(search_terms_position.end());
   url_canon::StdStringReplacements<std::string> replacements;
   if (search_term_component == url_parse::Parsed::REF)