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

content/common/plugin_list_posix.cc

 // Copyright (c) 2011 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/common/plugin_list.h"
 
 #include <algorithm>
 #include <dlfcn.h>
 #if defined(OS_OPENBSD)
 #include <sys/exec_elf.h>
@@ skipping 303 matching lines @@
   // The plugin name and description live behind NP_GetValue calls.
   typedef NPError (*NP_GetValueType)(void* unused,
                                      nsPluginVariable variable,
                                      void* value_out);
   NP_GetValueType NP_GetValue =
       reinterpret_cast<NP_GetValueType>(dlsym(dl, "NP_GetValue"));
   if (NP_GetValue) {
     const char* name = NULL;
     NP_GetValue(NULL, nsPluginVariable_NameString, &name);
     if (name) {
-      info->name = UTF8ToUTF16(name);
+      info->name = base::UTF8ToUTF16(name);
       ExtractVersionString(name, info);
     }
 
     const char* description = NULL;
     NP_GetValue(NULL, nsPluginVariable_DescriptionString, &description);
     if (description) {
-      info->desc = UTF8ToUTF16(description);
+      info->desc = base::UTF8ToUTF16(description);
       if (info->version.empty())
         ExtractVersionString(description, info);
     }
 
     LOG_IF(ERROR, PluginList::DebugPluginLoading())
         << "Got info for plugin " << filename.value()
-        << " Name = \"" << UTF16ToUTF8(info->name)
-        << "\", Description = \"" << UTF16ToUTF8(info->desc)
-        << "\", Version = \"" << UTF16ToUTF8(info->version)
+        << " Name = \"" << base::UTF16ToUTF8(info->name)
+        << "\", Description = \"" << base::UTF16ToUTF8(info->desc)
+        << "\", Version = \"" << base::UTF16ToUTF8(info->version)
         << "\".";
   } else {
     LOG_IF(ERROR, PluginList::DebugPluginLoading())
         << "Plugin " << filename.value()
         << " has no GetValue() and probably won't work.";
   }
 
   // Intentionally not unloading the plugin here, it can lead to crashes.
 
   return true;
@@ skipping 25 matching lines @@
     if (end == std::string::npos)
       break;
     const std::string extensions = description.substr(ofs, end - ofs);
     base::SplitString(extensions, ',', &mime_type.file_extensions);
     ofs = end + 1;
 
     end = description.find(';', ofs);
     // It's ok for end to run off the string here.  If there's no
     // trailing semicolon we consume the remainder of the string.
     if (end != std::string::npos) {
-      mime_type.description = UTF8ToUTF16(description.substr(ofs, end - ofs));
+      mime_type.description =
+          base::UTF8ToUTF16(description.substr(ofs, end - ofs));
     } else {
-      mime_type.description = UTF8ToUTF16(description.substr(ofs));
+      mime_type.description = base::UTF8ToUTF16(description.substr(ofs));
     }
     mime_types->push_back(mime_type);
     if (end == std::string::npos)
       break;
     ofs = end + 1;
   }
 }
 
 // static
 void PluginList::ExtractVersionString(const std::string& desc,
@@ skipping 17 matching lines @@
       version = desc.substr(pos + strlen(kPrePostFixes[i].kPrefix));
       pos = std::string::npos;
       if (kPrePostFixes[i].kPostfix)
         pos = version.find(kPrePostFixes[i].kPostfix);
       if (pos != std::string::npos)
         version = version.substr(0, pos);
       break;
     }
   }
   if (!version.empty()) {
-    info->version = UTF8ToUTF16(version);
+    info->version = base::UTF8ToUTF16(version);
   }
 }
 
 void PluginList::GetPluginDirectories(std::vector<base::FilePath>* plugin_dirs) {
   // See http://groups.google.com/group/chromium-dev/browse_thread/thread/7a70e5fcbac786a9
   // for discussion.
   // We first consult Chrome-specific dirs, then fall back on the logic
   // Mozilla uses.
 
   if (PluginList::plugins_discovery_disabled_)
@@ skipping 147 matching lines @@
   }
 
   // TODO(evanm): prefer the newest version of flash, etc. here?
 
   VLOG_IF(1, PluginList::DebugPluginLoading()) << "Using " << info.path.value();
 
   return true;
 }
 
 }  // namespace content