Move UTF16ToASCII, remove WideToASCII.

content/common/plugin_list_win.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 "content/common/plugin_list.h"
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
 #include "base/file_version_info_win.h"
 #include "base/files/memory_mapped_file.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/win/pe_image.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/windows_version.h"
 #include "content/common/plugin_constants_win.h"
 
 namespace content {
 namespace {
 
 const base::char16 kRegistryApps[] =
@@ skipping 248 matching lines @@
   FileVersionInfoWin* version_info_win =
       static_cast<FileVersionInfoWin*>(version_info.get());
 
   info->name = version_info->product_name();
   info->desc = version_info->file_description();
   info->version = version_info->file_version();
   info->path = filename;
 
   // TODO(evan): Move the ParseMimeTypes code inline once Pepper is updated.
   if (!PluginList::ParseMimeTypes(
-          UTF16ToASCII(version_info_win->GetStringValue(L"MIMEType")),
-          UTF16ToASCII(version_info_win->GetStringValue(L"FileExtents")),
+          base::UTF16ToASCII(version_info_win->GetStringValue(L"MIMEType")),
+          base::UTF16ToASCII(version_info_win->GetStringValue(L"FileExtents")),
           version_info_win->GetStringValue(L"FileOpenName"),
           &info->mime_types)) {
     LOG_IF(ERROR, PluginList::DebugPluginLoading())
         << "Plugin " << info->name << " has bad MIME types, skipping";
     return false;
   }
 
   return true;
 }
 
@@ skipping 166 matching lines @@
 #if !defined(ARCH_CPU_X86_64)
   // The plugin in question could be a 64 bit plugin which we cannot load.
   base::FilePath plugin_path(info.path);
   if (!IsValid32BitImage(base::MakeAbsoluteFilePath(plugin_path)))
     return false;
 #endif
   return true;
 }
 
 }  // namespace content