Move more uses of string16 to specify base::

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 208 matching lines @@
                                        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));
       base::string16 accelerator_removed =
-          RemoveAcceleratorChar(text, static_cast<char16>(kAcceleratorChar),
+          RemoveAcceleratorChar(text,
+                                static_cast<base::char16>(kAcceleratorChar),
                                 NULL, NULL);
       utf8 = UTF16ToUTF8(accelerator_removed);
     } else {
       utf8 = UTF16ToUTF8(text);
     }
 
     pango_layout_set_text(layout, utf8.data(), utf8.size());
   }
 }
 
@@ skipping 54 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