Convert string16 to base::string16 in content.

content/common/font_cache_dispatcher_win.cc

Index: content/common/font_cache_dispatcher_win.cc
diff --git a/content/common/font_cache_dispatcher_win.cc b/content/common/font_cache_dispatcher_win.cc
index d6d59ded084f12530ec508398cb3f94439f74f62..47c9c122404444a1adad90b056c619ace003f335 100644
--- a/content/common/font_cache_dispatcher_win.cc
+++ b/content/common/font_cache_dispatcher_win.cc
@@ -13,7 +13,7 @@
 
 namespace content {
 namespace {
-typedef std::vector<string16> FontNameVector;
+typedef std::vector<base::string16> FontNameVector;
 typedef std::map<FontCacheDispatcher*, FontNameVector> DispatcherToFontNames;
 
 class FontCache {
@@ -23,7 +23,7 @@ class FontCache {
   }
 
   void PreCacheFont(const LOGFONT& font, FontCacheDispatcher* dispatcher) {
-    typedef std::map<string16, FontCache::CacheElement> FontNameToElement;
+    typedef std::map<base::string16, FontCache::CacheElement> FontNameToElement;
 
     base::AutoLock lock(mutex_);
 
@@ -41,7 +41,7 @@ class FontCache {
     BOOL ret = GetTextMetrics(hdc, &tm);
     DCHECK(ret);
 
-    string16 font_name = font.lfFaceName;
+    base::string16 font_name = font.lfFaceName;
     int ref_count_inc = 1;
     FontNameVector::iterator it =
         std::find(dispatcher_font_map_[dispatcher].begin(),
@@ -68,7 +68,7 @@ class FontCache {
   }
 
   void ReleaseCachedFonts(FontCacheDispatcher* dispatcher) {
-    typedef std::map<string16, FontCache::CacheElement> FontNameToElement;
+    typedef std::map<base::string16, FontCache::CacheElement> FontNameToElement;
 
     base::AutoLock lock(mutex_);
 
@@ -125,7 +125,7 @@ class FontCache {
   FontCache() {
   }
 
-  std::map<string16, CacheElement> cache_;
+  std::map<base::string16, CacheElement> cache_;
   DispatcherToFontNames dispatcher_font_map_;
   base::Lock mutex_;