Use ASCII strings for switch names.

chrome/common/chrome_plugin_util.cc

 // Copyright (c) 2006-2008 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 "chrome/common/chrome_plugin_util.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
@@ skipping 114 matching lines @@
                                           std::string* arguments) {
   const CommandLine cmd = *CommandLine::ForCurrentProcess();
   std::wstring arguments_w;
 
   // Use the same UserDataDir for new launches that we currently have set.
   std::wstring user_data_dir = cmd.GetSwitchValue(switches::kUserDataDir);
   if (!user_data_dir.empty()) {
     // Make sure user_data_dir is an absolute path.
     if (file_util::AbsolutePath(&user_data_dir) &&
         file_util::PathExists(user_data_dir)) {
-      arguments_w += std::wstring(L"--") + switches::kUserDataDir +
+      // TODO(evanm): use CommandLine APIs instead of this.
+      arguments_w += std::wstring(L"--") + ASCIIToWide(switches::kUserDataDir) +
                      L"=\"" + user_data_dir + L"\" ";
     }
   }
 
   // Use '--app=url' instead of just 'url' to launch the browser with minimal
   // chrome.
   // Note: Do not change this flag!  Old Gears shortcuts will break if you do!
   std::string url_string(url);
   ReplaceSubstringsAfterOffset(&url_string, 0, "\"", "\\\"");
   ReplaceSubstringsAfterOffset(&url_string, 0, "%", "%%");
   ReplaceSubstringsAfterOffset(&url_string, 0, ";", "");
   ReplaceSubstringsAfterOffset(&url_string, 0, "$", "");
   std::wstring url_w = UTF8ToWide(url_string);
-  arguments_w += std::wstring(L"--") + switches::kApp + L"=\"" + url_w + L"\"";
+  // TODO(evanm): use CommandLine APIs instead of this.
+  arguments_w += std::wstring(L"--") + ASCIIToWide(switches::kApp) +
+      L"=\"" + url_w + L"\"";
 
   *arguments = WideToUTF8(arguments_w);
 
   return CPERR_SUCCESS;
 }
 
 //
 // Host functions shared by browser and plugin processes
 //
 
 void* STDCALL CPB_Alloc(uint32 size) {
   return malloc(size);
 }
 
 void STDCALL CPB_Free(void* memory) {
   free(memory);
 }