CommandLine: add a CopySwitchesFrom() for copying from another CommandLine

chrome/browser/plugin_process_host.cc

 // Copyright (c) 2010 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/browser/plugin_process_host.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #elif defined(OS_POSIX)
 #include <utility>  // for pair<>
@@ skipping 345 matching lines @@
       browser_command_line.GetSwitchValue(switches::kPluginLauncher);
   FilePath exe_path = GetChildPath(plugin_launcher.empty());
   if (exe_path.empty())
     return false;
 
   CommandLine* cmd_line = new CommandLine(exe_path);
   // Put the process type and plugin path first so they're easier to see
   // in process listings using native process management tools.
   cmd_line->AppendSwitchWithValue(switches::kProcessType,
                                   switches::kPluginProcess);
-  cmd_line->AppendSwitchWithValue(switches::kPluginPath,
-                                  info.path.ToWStringHack());
+  cmd_line->AppendSwitchPath(switches::kPluginPath, info.path);
 
   if (logging::DialogsAreSuppressed())
     cmd_line->AppendSwitch(switches::kNoErrorDialogs);
 
   // Propagate the following switches to the plugin command line (along with
   // any associated values) if present in the browser command line
-  static const char* const switch_names[] = {
+  static const char* const kSwitchNames[] = {
     switches::kPluginStartupDialog,
     switches::kNoSandbox,
     switches::kSafePlugins,
     switches::kTestSandbox,
     switches::kUserAgent,
     switches::kDisableBreakpad,
     switches::kFullMemoryCrashReport,
     switches::kEnableLogging,
     switches::kDisableLogging,
     switches::kLoggingLevel,
     switches::kLogPluginMessages,
     switches::kUserDataDir,
     switches::kEnableDCHECK,
     switches::kSilentDumpOnDCHECK,
     switches::kMemoryProfiling,
     switches::kUseLowFragHeapCrt,
     switches::kEnableStatsTable,
     switches::kEnableGPUPlugin,
     switches::kUseGL,
 #if defined(OS_CHROMEOS)
     switches::kProfile,
 #endif
   };
 
-  for (size_t i = 0; i < arraysize(switch_names); ++i) {
-    if (browser_command_line.HasSwitch(switch_names[i])) {
-      cmd_line->AppendSwitchWithValue(
-          switch_names[i],
-          browser_command_line.GetSwitchValueASCII(switch_names[i]));
-    }
-  }
+  cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
+                             arraysize(kSwitchNames));
 
   // If specified, prepend a launcher program to the command line.
   if (!plugin_launcher.empty())
     cmd_line->PrependWrapper(plugin_launcher);
 
   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);
   }
 
   // Gears requires the data dir to be available on startup.
-  std::wstring data_dir =
-    PluginService::GetInstance()->GetChromePluginDataDir().ToWStringHack();
+  FilePath data_dir =
+    PluginService::GetInstance()->GetChromePluginDataDir();
   DCHECK(!data_dir.empty());
-  cmd_line->AppendSwitchWithValue(switches::kPluginDataDir, data_dir);
+  cmd_line->AppendSwitchPath(switches::kPluginDataDir, data_dir);
 
-  cmd_line->AppendSwitchWithValue(switches::kProcessChannelID,
-                                  ASCIIToWide(channel_id()));
+  cmd_line->AppendSwitchWithValue(switches::kProcessChannelID, channel_id());
 
   SetCrashReporterCommandLine(cmd_line);
 
 #if defined(OS_POSIX)
   base::environment_vector env;
 #if defined(OS_MACOSX) && !defined(__LP64__)
   // Add our interposing library for Carbon. This is stripped back out in
   // plugin_main.cc, so changes here should be reflected there.
   std::string interpose_list(plugin_interpose_strings::kInterposeLibraryPath);
   const char* existing_list =
@@ skipping 233 matching lines @@
     const std::vector<uint8>& data) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
 
   ChromePluginLib *chrome_plugin = ChromePluginLib::Find(info_.path);
   if (chrome_plugin) {
     void *data_ptr = const_cast<void*>(reinterpret_cast<const void*>(&data[0]));
     uint32 data_len = static_cast<uint32>(data.size());
     chrome_plugin->functions().on_message(data_ptr, data_len);
   }
 }