Remove the old NativeMB functions from string util, and use the new ones in sys_strings.h. I also removed duplicated code from the sandbox that can now use this, and fixed one case in the bug reporter that should not have been using the native multibyte encoding.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@515 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 12 insertions, 8 deletions

diff --git a/webkit/glue/plugins/plugin_lib.cc b/webkit/glue/plugins/plugin_lib.cc
index 8f28284..64d2906 100644
--- a/webkit/glue/plugins/plugin_lib.cc
+++ b/webkit/glue/plugins/plugin_lib.cc
@@ -38,6 +38,7 @@
 #include "base/path_service.h"
 #include "base/stats_counters.h"
 #include "base/string_util.h"
+#include "base/sys_string_conversions.h"
 #include "base/task.h"
 #include "webkit/activex_shim/npp_impl.h"
 #include "webkit/default_plugin/plugin_main.h"
@@ -369,8 +370,8 @@ void PluginLib::Shutdown() {
 WebPluginInfo* PluginLib::CreateWebPluginInfo(const PluginVersionInfo& pvi) {
   std::vector<std::string> mime_types, file_extensions;
   std::vector<std::wstring> descriptions;
-  SplitString(WideToNativeMB(pvi.mime_types), '|', &mime_types);
-  SplitString(WideToNativeMB(pvi.file_extents), '|', &file_extensions);
+  SplitString(base::SysWideToNativeMB(pvi.mime_types), '|', &mime_types);
+  SplitString(base::SysWideToNativeMB(pvi.file_extents), '|', &file_extensions);
   SplitString(pvi.file_open_names, '|', &descriptions);
 
   if (mime_types.empty())
diff --git a/webkit/glue/plugins/plugin_list.cc b/webkit/glue/plugins/plugin_list.cc
index 8c8deef..38b4bee 100644
--- a/webkit/glue/plugins/plugin_list.cc
+++ b/webkit/glue/plugins/plugin_list.cc
@@ -39,6 +39,7 @@
 #include "base/registry.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
+#include "base/sys_string_conversions.h"
 #include "base/time.h"
 #include "webkit/activex_shim/activex_shared.h"
 #include "webkit/glue/webkit_glue.h"
@@ -275,12 +276,13 @@ PluginLib* PluginList::FindPlugin(const std::string& mime_type,
 }
 
 PluginLib* PluginList::FindPlugin(const GURL &url, std::string* actual_mime_type) {
-  std::wstring path = NativeMBToWide(url.path());
+  std::wstring path = base::SysNativeMBToWide(url.path());
   std::wstring extension_wide = file_util::GetFileExtensionFromPath(path);
   if (extension_wide.empty())
     return NULL;;
 
-  std::string extension = StringToLowerASCII(WideToNativeMB(extension_wide));
+  std::string extension =
+      StringToLowerASCII(base::SysWideToNativeMB(extension_wide));
 
   for (size_t idx = 0; idx < plugins_.size(); ++idx) {
     if (SupportsExtension(plugins_[idx]->plugin_info(), extension, actual_mime_type)) {
diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc
index 421c91f..91d66b5 100644
--- a/webkit/glue/webplugin_impl.cc
+++ b/webkit/glue/webplugin_impl.cc
@@ -62,6 +62,7 @@
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
+#include "base/sys_string_conversions.h"
 #include "net/base/escape.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/webkit_glue.h"
@@ -172,8 +173,8 @@ void WebPluginContainer::didReceiveResponse(
   }
 
   impl_->delegate_->DidReceiveManualResponse(
-      ascii_url, WideToNativeMB(mime_type),
-      WideToNativeMB(impl_->GetAllHeaders(response)),
+      ascii_url, base::SysWideToNativeMB(mime_type),
+      base::SysWideToNativeMB(impl_->GetAllHeaders(response)),
       expected_length, last_modified);
 }
 
@@ -826,8 +827,8 @@ void WebPluginImpl::didReceiveResponse(WebCore::ResourceHandle* handle,
     expected_length = 0;
   }
 
-  client->DidReceiveResponse(WideToNativeMB(mime_type),
-                             WideToNativeMB(GetAllHeaders(response)),
+  client->DidReceiveResponse(base::SysWideToNativeMB(mime_type),
+                             base::SysWideToNativeMB(GetAllHeaders(response)),
                              expected_length,
                              last_modified,
                              &cancel);