Update uses of UTF conversions in content/ to use the base:: namespace.

content/child/browser_font_resource_trusted.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 "content/child/browser_font_resource_trusted.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ppapi/c/dev/ppb_font_dev.h"
 #include "ppapi/proxy/connection.h"
@@ skipping 47 matching lines @@
 // but the font drawing and measurement routines we call happen after this
 // step. So for correct rendering of RTL content, we need to do it ourselves.
 class TextRunCollection {
  public:
   explicit TextRunCollection(const PP_BrowserFont_Trusted_TextRun& run)
       : bidi_(NULL),
         num_runs_(0) {
     StringVar* text_string = StringVar::FromPPVar(run.text);
     if (!text_string)
       return;  // Leave num_runs_ = 0 so we'll do nothing.
-    text_ = UTF8ToUTF16(text_string->value());
+    text_ = base::UTF8ToUTF16(text_string->value());
 
     if (run.override_direction) {
       // Skip autodetection.
       num_runs_ = 1;
       override_run_ = WebTextRun(text_, PP_ToBool(run.rtl), true);
     } else {
       bidi_ = ubidi_open();
       UErrorCode uerror = U_ZERO_ERROR;
       ubidi_setPara(bidi_, text_.data(), text_.size(), run.rtl, NULL, &uerror);
       if (U_SUCCESS(uerror))
@@ skipping 41 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(TextRunCollection);
 };
 
 bool PPTextRunToWebTextRun(const PP_BrowserFont_Trusted_TextRun& text,
                            WebTextRun* run) {
   StringVar* text_string = StringVar::FromPPVar(text.text);
   if (!text_string)
     return false;
 
-  *run = WebTextRun(UTF8ToUTF16(text_string->value()),
+  *run = WebTextRun(base::UTF8ToUTF16(text_string->value()),
                     PP_ToBool(text.rtl),
                     PP_ToBool(text.override_direction));
   return true;
 }
 
 // The PP_* version lacks "None", so is just one value shifted from the
 // WebFontDescription version. These values are checked in
 // PPFontDescToWebFontDesc to make sure the conversion is correct. This is a
 // macro so it can also be used in the COMPILE_ASSERTS.
 #define PP_FAMILY_TO_WEB_FAMILY(f) \
@@ skipping 43 matching lines @@
                                          kCommonScript);
         break;
       case PP_BROWSERFONT_TRUSTED_FAMILY_DEFAULT:
       default:
         resolved_family = GetFontFromMap(prefs.standard_font_family_map,
                                          kCommonScript);
         break;
     }
   } else {
     // Use the exact font.
-    resolved_family = UTF8ToUTF16(face_name->value());
+    resolved_family = base::UTF8ToUTF16(face_name->value());
   }
   result.family = resolved_family;
 
   result.genericFamily = PP_FAMILY_TO_WEB_FAMILY(font.family);
 
   if (font.size == 0) {
     // Resolve the default font size, using the resolved family to see if
     // we should use the fixed or regular font size. It's difficult at this
     // level to detect if the requested font is fixed width, so we only apply
     // the alternate font size to the default fixed font family.
@@ skipping 61 matching lines @@
 
 PP_Bool BrowserFontResource_Trusted::Describe(
     PP_BrowserFont_Trusted_Description* description,
     PP_BrowserFont_Trusted_Metrics* metrics) {
   if (description->face.type != PP_VARTYPE_UNDEFINED)
     return PP_FALSE;
 
   // While converting the other way in PPFontDescToWebFontDesc we validated
   // that the enums can be casted.
   WebFontDescription web_desc = font_->fontDescription();
-  description->face = StringVar::StringToPPVar(UTF16ToUTF8(web_desc.family));
+  description->face =
+      StringVar::StringToPPVar(base::UTF16ToUTF8(web_desc.family));
   description->family =
       static_cast<PP_BrowserFont_Trusted_Family>(web_desc.genericFamily);
   description->size = static_cast<uint32_t>(web_desc.size);
   description->weight = static_cast<PP_BrowserFont_Trusted_Weight>(
       web_desc.weight);
   description->italic = web_desc.italic ? PP_TRUE : PP_FALSE;
   description->small_caps = web_desc.smallCaps ? PP_TRUE : PP_FALSE;
   description->letter_spacing = static_cast<int32_t>(web_desc.letterSpacing);
   description->word_spacing = static_cast<int32_t>(web_desc.wordSpacing);
 
@@ skipping 132 matching lines @@
 
     // Advance to the next run. Note that we avoid doing this for the last run
     // since it's unnecessary, measuring text is slow, and most of the time
     // there will be only one run anyway.
     if (i != runs.num_runs() - 1)
       web_position.x += font_->calculateWidth(run);
   }
 }
 
 }  // namespace content