5 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/chrome_plugin_host.cc b/chrome/browser/chrome_plugin_host.cc
index dc06c09..806ffe2 100644
--- a/chrome/browser/chrome_plugin_host.cc
+++ b/chrome/browser/chrome_plugin_host.cc
@@ -472,8 +472,8 @@ int STDCALL CPB_GetBrowsingContextInfo(
     PluginService* service = PluginService::GetInstance();
     if (!service)
       return CPERR_FAILURE;
-    const std::wstring& wretval = service->GetUILocale();
-    *static_cast<char**>(buf) = CPB_StringDup(CPB_Alloc, WideToUTF8(wretval));
+    const std::string& retval = service->GetUILocale();
+    *static_cast<char**>(buf) = CPB_StringDup(CPB_Alloc, retval);
     return CPERR_SUCCESS;
     }
   }
diff --git a/chrome/browser/plugin_process_host.cc b/chrome/browser/plugin_process_host.cc
index c4fdf45..6108a46 100644
--- a/chrome/browser/plugin_process_host.cc
+++ b/chrome/browser/plugin_process_host.cc
@@ -339,7 +339,7 @@ PluginProcessHost::~PluginProcessHost() {
 }
 
 bool PluginProcessHost::Init(const WebPluginInfo& info,
-                             const std::wstring& locale) {
+                             const std::string& locale) {
   info_ = info;
   set_name(UTF16ToWideHack(info_.name));
   set_version(UTF16ToWideHack(info_.version));
@@ -402,7 +402,7 @@ bool PluginProcessHost::Init(const WebPluginInfo& info,
   if (!locale.empty()) {
     // Pass on the locale so the null plugin will use the right language in the
     // prompt to install the desired plugin.
-    cmd_line->AppendSwitchWithValue(switches::kLang, locale);
+    cmd_line->AppendSwitchASCII(switches::kLang, locale);
   }
 
   // Gears requires the data dir to be available on startup.
diff --git a/chrome/browser/plugin_process_host.h b/chrome/browser/plugin_process_host.h
index b8a1d71..5254752 100644
--- a/chrome/browser/plugin_process_host.h
+++ b/chrome/browser/plugin_process_host.h
@@ -46,7 +46,7 @@ class PluginProcessHost : public BrowserChildProcessHost,
 
   // Initialize the new plugin process, returning true on success. This must
   // be called before the object can be used.
-  bool Init(const WebPluginInfo& info, const std::wstring& locale);
+  bool Init(const WebPluginInfo& info, const std::string& locale);
 
   // Force the plugin process to shutdown (cleanly).
   void ForceShutdown();
diff --git a/chrome/browser/plugin_service.cc b/chrome/browser/plugin_service.cc
index b7f0489..f6ecaac 100644
--- a/chrome/browser/plugin_service.cc
+++ b/chrome/browser/plugin_service.cc
@@ -79,7 +79,7 @@ void PluginService::EnableChromePlugins(bool enable) {
 PluginService::PluginService()
     : main_message_loop_(MessageLoop::current()),
       resource_dispatcher_host_(NULL),
-      ui_locale_(ASCIIToWide(g_browser_process->GetApplicationLocale())) {
+      ui_locale_(g_browser_process->GetApplicationLocale()) {
   RegisterPepperPlugins();
 
   // Have the NPAPI plugin list search for Chrome plugins as well.
@@ -173,7 +173,7 @@ const FilePath& PluginService::GetChromePluginDataDir() {
   return chrome_plugin_data_dir_;
 }
 
-const std::wstring& PluginService::GetUILocale() {
+const std::string& PluginService::GetUILocale() {
   return ui_locale_;
 }
 
diff --git a/chrome/browser/plugin_service.h b/chrome/browser/plugin_service.h
index fd1633d..9745973 100644
--- a/chrome/browser/plugin_service.h
+++ b/chrome/browser/plugin_service.h
@@ -61,7 +61,7 @@ class PluginService
   const FilePath& GetChromePluginDataDir();
 
   // Gets the browser's UI locale.
-  const std::wstring& GetUILocale();
+  const std::string& GetUILocale();
 
   // Returns the plugin process host corresponding to the plugin process that
   // has been started by this service. Returns NULL if no process has been
@@ -135,7 +135,7 @@ class PluginService
   FilePath chrome_plugin_data_dir_;
 
   // The browser's UI locale.
-  const std::wstring ui_locale_;
+  const std::string ui_locale_;
 
   // Map of plugin paths to the origin they are restricted to.  Used for
   // extension-only plugins.