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

chrome/browser/autocomplete/shortcuts_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/shortcuts_provider.h"
 
 #include <algorithm>
 #include <cmath>
 #include <map>
 #include <vector>
@@ skipping 38 matching lines @@
 // Like URLPrefix::BestURLPrefix() except also handles the prefix of
 // "www.".  This is needed because sometimes the string we're matching
 // against here (which comes from |fill_into_edit|) can start with
 // "www." without having a protocol at the beginning.  Because "www."
 // is not on the default prefix list, we test for it explicitly here
 // and use that match if the default list didn't have a match or the
 // default list's match was shorter than it could've been.
 const URLPrefix* BestURLPrefixWithWWWCase(
     const base::string16& text,
     const base::string16& prefix_suffix) {
-  CR_DEFINE_STATIC_LOCAL(URLPrefix, www_prefix, (ASCIIToUTF16("www."), 1));
+  CR_DEFINE_STATIC_LOCAL(URLPrefix, www_prefix,
+                         (base::ASCIIToUTF16("www."), 1));
   const URLPrefix* best_prefix = URLPrefix::BestURLPrefix(text, prefix_suffix);
   if ((best_prefix == NULL) ||
       (best_prefix->num_components < www_prefix.num_components)) {
     if (URLPrefix::PrefixMatch(www_prefix, text, prefix_suffix))
       best_prefix = &www_prefix;
   }
   return best_prefix;
 }
 
 }  // namespace
@@ skipping 143 matching lines @@
     const base::string16& fixed_up_term_string,
     const bool prevent_inline_autocomplete) {
   DCHECK(!term_string.empty());
   AutocompleteMatch match(shortcut.match_core.ToMatch());
   match.provider = this;
   match.relevance = relevance;
   match.deletable = true;
   DCHECK(match.destination_url.is_valid());
   match.RecordAdditionalInfo("number of hits", shortcut.number_of_hits);
   match.RecordAdditionalInfo("last access time", shortcut.last_access_time);
-  match.RecordAdditionalInfo("original input text", UTF16ToUTF8(shortcut.text));
+  match.RecordAdditionalInfo("original input text",
+                             base::UTF16ToUTF8(shortcut.text));
 
   // Set |inline_autocompletion| and |allowed_to_be_default_match| if possible.
   // If the match is a search query this is easy: simply check whether the
   // user text is a prefix of the query.  If the match is a navigation, we
   // assume the fill_into_edit looks something like a URL, so we use
   // BestURLPrefix() to try and strip off any prefixes that the user might
   // not think would change the meaning, but would otherwise prevent inline
   // autocompletion.  This allows, for example, the input of "foo.c" to
   // autocomplete to "foo.com" for a fill_into_edit of "http://foo.com".
   if (AutocompleteMatch::IsSearchType(match.type)) {
@@ skipping 186 matching lines @@
   // (1.0 / each 5 additional hits), up to a maximum of 5x as long.
   const double kMaxDecaySpeedDivisor = 5.0;
   const double kNumUsesPerDecaySpeedDivisorIncrement = 5.0;
   double decay_divisor = std::min(kMaxDecaySpeedDivisor,
       (shortcut.number_of_hits + kNumUsesPerDecaySpeedDivisorIncrement - 1) /
       kNumUsesPerDecaySpeedDivisorIncrement);
 
   return static_cast<int>((base_score / exp(decay_exponent / decay_divisor)) +
       0.5);
 }