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

chrome/browser/first_run_win.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/first_run.h"
 
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
@@ skipping 664 matching lines @@
   process_singleton->Unlock();
   FirstRun::CreateSentinel();
 }
 
 bool FirstRun::ImportSettings(Profile* profile, int browser_type,
                               int items_to_import,
                               const std::wstring& import_bookmarks_path,
                               HWND parent_window) {
   const CommandLine& cmdline = *CommandLine::ForCurrentProcess();
   CommandLine import_cmd(cmdline.GetProgram());
-  // Propagate user data directory switch.
-  if (cmdline.HasSwitch(switches::kUserDataDir)) {
-    import_cmd.AppendSwitchWithValue(
-        switches::kUserDataDir,
-        cmdline.GetSwitchValueASCII(switches::kUserDataDir));
-  }
+
+  const char* kSwitchNames[] = {
+    switches::kUserDataDir,
+    switches::kChromeFrame,
+    switches::kCountry,
+  };
+  import_cmd.CopySwitchesFrom(cmdline, kSwitchNames, arraysize(kSwitchNames));
 
   // Since ImportSettings is called before the local state is stored on disk
   // we pass the language as an argument.  GetApplicationLocale checks the
   // current command line as fallback.
   import_cmd.AppendSwitchWithValue(
       switches::kLang,
       ASCIIToWide(g_browser_process->GetApplicationLocale()));
 
   if (items_to_import) {
     import_cmd.CommandLine::AppendSwitchWithValue(switches::kImport,
         EncodeImportParams(browser_type, items_to_import, parent_window));
   }
 
   if (!import_bookmarks_path.empty()) {
     import_cmd.CommandLine::AppendSwitchWithValue(
         switches::kImportFromFile, import_bookmarks_path.c_str());
   }
 
-  if (cmdline.HasSwitch(switches::kChromeFrame)) {
-    import_cmd.AppendSwitch(switches::kChromeFrame);
-  }
-
-  if (cmdline.HasSwitch(switches::kCountry)) {
-    import_cmd.AppendSwitchWithValue(switches::kCountry,
-      cmdline.GetSwitchValueASCII(switches::kCountry));
-  }
-
   // Time to launch the process that is going to do the import.
   base::ProcessHandle import_process;
   if (!base::LaunchApp(import_cmd, false, false, &import_process))
     return false;
 
   // Activate the importer monitor. It awakes periodically in another thread
   // and checks that the importer UI is still pumping messages.
   if (parent_window)
     HungImporterMonitor hang_monitor(parent_window, import_process);
 
@@ skipping 334 matching lines @@
 
 Upgrade::TryResult Upgrade::ShowTryChromeDialog(size_t version) {
   if (version > 10000) {
     // This is a test value. We want to make sure we exercise
     // returning this early. See EarlyReturnTest test harness.
     return Upgrade::TD_NOT_NOW;
   }
   TryChromeDialog td;
   return td.ShowModal();
 }