Move UTF16ToASCII, remove WideToASCII.

content/renderer/renderer_webkitplatformsupport_impl.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/renderer/renderer_webkitplatformsupport_impl.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/memory/shared_memory.h"
@@ skipping 391 matching lines @@
     return IsNotSupported;
 
   if (!key_system.isEmpty()) {
     // Check whether the key system is supported with the mime_type and codecs.
 
     // Chromium only supports ASCII parameters.
     if (!IsStringASCII(key_system))
       return IsNotSupported;
 
     std::string key_system_ascii =
-        GetUnprefixedKeySystemName(UTF16ToASCII(key_system));
+        GetUnprefixedKeySystemName(base::UTF16ToASCII(key_system));
     std::vector<std::string> strict_codecs;
     bool strip_suffix = !net::IsStrictMediaMimeType(mime_type_ascii);
     net::ParseCodecString(ToASCIIOrEmpty(codecs), &strict_codecs, strip_suffix);
 
     if (!IsSupportedKeySystemWithMediaMimeType(
             mime_type_ascii, strict_codecs, key_system_ascii)) {
       return IsNotSupported;
     }
 
     // Continue processing the mime_type and codecs.
@@ skipping 45 matching lines @@
     const WebString& codecs) {
   // Chromium only supports ASCII parameters.
   if (!IsStringASCII(key_system) || !IsStringASCII(mime_type) ||
       !IsStringASCII(codecs)) {
     return false;
   }
 
   if (key_system.isEmpty())
     return false;
 
-  const std::string mime_type_ascii = UTF16ToASCII(mime_type);
+  const std::string mime_type_ascii = base::UTF16ToASCII(mime_type);
 
   std::vector<std::string> codec_vector;
   bool strip_suffix = !net::IsStrictMediaMimeType(mime_type_ascii);
-  net::ParseCodecString(UTF16ToASCII(codecs), &codec_vector, strip_suffix);
+  net::ParseCodecString(base::UTF16ToASCII(codecs), &codec_vector,
+                        strip_suffix);
 
   return IsSupportedKeySystemWithMediaMimeType(
-      mime_type_ascii, codec_vector, UTF16ToASCII(key_system));
+      mime_type_ascii, codec_vector, base::UTF16ToASCII(key_system));
 }
 
 WebString
 RendererWebKitPlatformSupportImpl::MimeRegistry::mimeTypeForExtension(
     const WebString& file_extension) {
   if (IsPluginProcess())
     return SimpleWebMimeRegistryImpl::mimeTypeForExtension(file_extension);
 
   // The sandbox restricts our access to the registry, so we need to proxy
   // these calls over to the browser process.
@@ skipping 659 matching lines @@
     return;
   QuotaDispatcher::ThreadSpecificInstance(
       thread_safe_sender_.get(),
       quota_message_filter_.get())->QueryStorageUsageAndQuota(
           storage_partition,
           static_cast<quota::StorageType>(type),
           QuotaDispatcher::CreateWebStorageQuotaCallbacksWrapper(callbacks));
 }
 
 }  // namespace content