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

chrome/common/badge_util.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/common/badge_util.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkPaint.h"
@@ skipping 85 matching lines @@
                               float font_size,
                               const base::string16& text,
                               const base::string16& fallback) {
   const int kMinPadding = 1;
 
   // Calculate the proper style/text overlay to render on the badge.
   SkPaint* paint = badge_util::GetBadgeTextPaintSingleton();
   paint->setTextSize(SkFloatToScalar(font_size));
   paint->setColor(SK_ColorWHITE);
 
-  std::string badge_text = UTF16ToUTF8(text);
+  std::string badge_text = base::UTF16ToUTF8(text);
 
   // See if the text will fit - otherwise use a default.
   SkScalar text_width = paint->measureText(badge_text.c_str(),
                                            badge_text.size());
 
   if (SkScalarRound(text_width) > (icon.width() - kMinPadding * 2)) {
     // String is too large - use the alternate text.
-    badge_text = UTF16ToUTF8(fallback);
+    badge_text = base::UTF16ToUTF8(fallback);
     text_width = paint->measureText(badge_text.c_str(), badge_text.size());
   }
 
   // When centering the text, we need to make sure there are an equal number
   // of pixels on each side as otherwise the text looks off-center. So if the
   // padding would be uneven, clip one pixel off the right side.
   int badge_width = icon.width();
   if ((SkScalarRound(text_width) % 1) != (badge_width % 1))
     badge_width--;
 
@@ skipping 95 matching lines @@
   canvas->sk_canvas()->drawText(
       text.c_str(), text.size(),
       SkFloatToScalar(rect.x() +
                       static_cast<float>(rect.width() - text_width) / 2),
       SkFloatToScalar(rect.y() + kTextSize + kTopTextPadding),
       *text_paint);
   canvas->Restore();
 }
 
 }  // namespace badge_util