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

chrome/browser/renderer_host/browser_render_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.
 
 // Represents the browser side of the browser <--> renderer communication
 // channel. There will be one RenderProcessHost per renderer process.
 
 #include "chrome/browser/renderer_host/browser_render_process_host.h"
 
 #include <algorithm>
@@ skipping 313 matching lines @@
     in_process_renderer_->StartWithOptions(options);
 
     OnProcessLaunched();  // Fake a callback that the process is ready.
   } else {
     // Build command line for renderer.  We call AppendRendererCommandLine()
     // first so the process type argument will appear first.
     CommandLine* cmd_line = new CommandLine(renderer_path);
     if (!renderer_prefix.empty())
       cmd_line->PrependWrapper(renderer_prefix);
     AppendRendererCommandLine(cmd_line);
-    cmd_line->AppendSwitchWithValue(switches::kProcessChannelID,
-                                    ASCIIToWide(channel_id));
+    cmd_line->AppendSwitchWithValue(switches::kProcessChannelID, channel_id);
 
     // Spawn the child process asynchronously to avoid blocking the UI thread.
     // As long as there's no renderer prefix, we can use the zygote process
     // at this stage.
     child_process_.reset(new ChildProcessLauncher(
 #if defined(OS_WIN)
         FilePath(),
 #elif defined(POSIX)
         renderer_prefix.empty(),
         base::environment_vector(),
@@ skipping 106 matching lines @@
 
   if (logging::DialogsAreSuppressed())
     command_line->AppendSwitch(switches::kNoErrorDialogs);
 
   // Now send any options from our own command line we want to propogate.
   const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
   PropagateBrowserCommandLineToRenderer(browser_command_line, command_line);
 
   // Pass on the browser locale.
   const std::string locale = g_browser_process->GetApplicationLocale();
-  command_line->AppendSwitchWithValue(switches::kLang, ASCIIToWide(locale));
+  command_line->AppendSwitchWithValue(switches::kLang, locale);
 
   // If we run FieldTrials, we want to pass to their state to the renderer so
   // that it can act in accordance with each state, or record histograms
   // relating to the FieldTrial states.
   std::string field_trial_states;
   FieldTrialList::StatesToString(&field_trial_states);
   if (!field_trial_states.empty()) {
     command_line->AppendSwitchWithValue(switches::kForceFieldTestNameAndValue,
         field_trial_states);
   }
 
   BrowserChildProcessHost::SetCrashReporterCommandLine(command_line);
 
   FilePath user_data_dir =
       browser_command_line.GetSwitchValuePath(switches::kUserDataDir);
-
   if (!user_data_dir.empty())
-    command_line->AppendSwitchWithValue(switches::kUserDataDir,
-                                        user_data_dir.value());
+    command_line->AppendSwitchPath(switches::kUserDataDir, user_data_dir);
 #if defined(OS_CHROMEOS)
   const std::string& profile =
       browser_command_line.GetSwitchValueASCII(switches::kProfile);
   if (!profile.empty())
     command_line->AppendSwitchWithValue(switches::kProfile, profile);
 #endif
 }
 
 void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer(
     const CommandLine& browser_cmd,
     CommandLine* renderer_cmd) const {
   // Propagate the following switches to the renderer 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::kRendererAssertTest,
 #if !defined(OFFICIAL_BUILD)
     switches::kRendererCheckFalseTest,
 #endif  // !defined(OFFICIAL_BUILD)
     switches::kRendererCrashTest,
     switches::kRendererStartupDialog,
     switches::kNoSandbox,
     switches::kTestSandbox,
 #if defined(USE_SECCOMP_SANDBOX)
     switches::kDisableSeccompSandbox,
@@ skipping 67 matching lines @@
     // Allow this to be set when invoking the browser and relayed along.
     switches::kEnableSandboxLogging,
     switches::kDisableFlashCoreAnimation,
 #endif
     switches::kRemoteShellPort,
     switches::kEnablePepperTesting,
     switches::kEnableChromoting,
     switches::kEnableClickToPlay,
     switches::kPrelaunchGpuProcess,
   };
-
-  for (size_t i = 0; i < arraysize(switch_names); ++i) {
-    if (browser_cmd.HasSwitch(switch_names[i])) {
-      renderer_cmd->AppendSwitchWithValue(switch_names[i],
-          browser_cmd.GetSwitchValueASCII(switch_names[i]));
-    }
-  }
+  renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames,
+                                 arraysize(kSwitchNames));
 
   // Disable databases in incognito mode.
   if (profile()->IsOffTheRecord() &&
       !browser_cmd.HasSwitch(switches::kDisableDatabases)) {
     renderer_cmd->AppendSwitch(switches::kDisableDatabases);
   }
 }
 
 base::ProcessHandle BrowserRenderProcessHost::GetHandle() {
   // child_process_ is null either because we're in single process mode, we have
@@ skipping 472 matching lines @@
         IPC::InvalidPlatformFileForTransit(),
         std::vector<std::string>(),
         std::string(),
         false));
   }
 }
 
 void BrowserRenderProcessHost::EnableAutoSpellCorrect(bool enable) {
   Send(new ViewMsg_SpellChecker_EnableAutoSpellCorrect(enable));
 }