ui/gfx: Use base::string16 now that string16 was moved into base namespace.

ui/gfx/pango_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 "ui/gfx/pango_util.h"
 
 #include <cairo/cairo.h>
 #include <fontconfig/fontconfig.h>
 #include <pango/pango.h>
 #include <pango/pangocairo.h>
@@ skipping 126 matching lines @@
   if (!determined_resolution) {
     determined_resolution = true;
     PangoContext* default_context = GetPangoContext();
     resolution = pango_cairo_context_get_resolution(default_context);
     g_object_unref(default_context);
   }
   return resolution;
 }
 
 void DrawTextOntoCairoSurface(cairo_t* cr,
-                              const string16& text,
+                              const base::string16& text,
                               const gfx::Font& font,
                               const gfx::Rect& bounds,
                               const gfx::Rect& clip,
                               SkColor text_color,
                               int flags) {
   PangoLayout* layout = pango_cairo_create_layout(cr);
   base::i18n::TextDirection text_direction =
       base::i18n::GetFirstStrongCharacterDirection(text);
   DCHECK(!bounds.IsEmpty());
 
@@ skipping 15 matching lines @@
   DrawPangoLayout(cr, layout, font, bounds, text_rect,
                   text_color, text_direction, flags);
 
   cairo_restore(cr);
   g_object_unref(layout);
 }
 
 // Pass a width greater than 0 to force wrapping and eliding.
 static void SetupPangoLayoutWithoutFont(
     PangoLayout* layout,
-    const string16& text,
+    const base::string16& text,
     int width,
     base::i18n::TextDirection text_direction,
     int flags) {
   cairo_font_options_t* cairo_font_options = GetCairoFontOptions();
 
   // If we got an explicit request to turn off subpixel rendering, disable it on
   // a copy of the static font options object.
   bool copied_cairo_font_options = false;
   if ((flags & Canvas::NO_SUBPIXEL_RENDERING) &&
       (cairo_font_options_get_antialias(cairo_font_options) ==
@@ skipping 65 matching lines @@
                                        strlen(escaped_text),
                                        kAcceleratorChar, NULL);
     g_free(escaped_text);
   } else {
     std::string utf8;
 
     // Remove the ampersand character.  A double ampersand is output as
     // a single ampersand.
     if (flags & Canvas::HIDE_PREFIX) {
       DCHECK_EQ(1, g_unichar_to_utf8(kAcceleratorChar, NULL));
-      string16 accelerator_removed =
+      base::string16 accelerator_removed =
           RemoveAcceleratorChar(text, static_cast<char16>(kAcceleratorChar),
                                 NULL, NULL);
       utf8 = UTF16ToUTF8(accelerator_removed);
     } else {
       utf8 = UTF16ToUTF8(text);
     }
 
     pango_layout_set_text(layout, utf8.data(), utf8.size());
   }
 }
 
 void SetupPangoLayout(PangoLayout* layout,
-                      const string16& text,
+                      const base::string16& text,
                       const Font& font,
                       int width,
                       base::i18n::TextDirection text_direction,
                       int flags) {
   SetupPangoLayoutWithoutFont(layout, text, width, text_direction, flags);
 
   ScopedPangoFontDescription desc(font.GetNativeFont());
   pango_layout_set_font_description(layout, desc.get());
 }
 
 void SetupPangoLayoutWithFontDescription(
     PangoLayout* layout,
-    const string16& text,
+    const base::string16& text,
     const std::string& font_description,
     int width,
     base::i18n::TextDirection text_direction,
     int flags) {
   SetupPangoLayoutWithoutFont(layout, text, width, text_direction, flags);
 
   ScopedPangoFontDescription desc(
       pango_font_description_from_string(font_description.c_str()));
   pango_layout_set_font_description(layout, desc.get());
 }
@@ skipping 101 matching lines @@
 
   if (i == desc_to_metrics->end()) {
     PangoFontMetrics* metrics = pango_context_get_metrics(context, desc, NULL);
     desc_to_metrics->insert(std::make_pair(desc_hash, metrics));
     return metrics;
   }
   return i->second;
 }
 
 }  // namespace gfx