CommandLine API rework

chrome/browser/first_run.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 <atlbase.h>
 #include <atlcom.h>
 #include <windows.h>
 #include <shlobj.h>
 
 #include <sstream>
@@ skipping 432 matching lines @@
   *browser = static_cast<int>(StringToInt64(v[0]));
   *options = static_cast<int>(StringToInt64(v[1]));
   *window = reinterpret_cast<HWND>(StringToInt64(v[2]));
   return true;
 }
 
 }  // namespace
 
 bool FirstRun::ImportSettings(Profile* profile, int browser,
                               int items_to_import, HWND parent_window) {
-  CommandLine cmdline;
-  std::wstring import_cmd(cmdline.program());
+  const CommandLine& cmdline = *CommandLine::ForCurrentProcess();
+  CommandLine import_cmd(cmdline.program());
   // Propagate the following switches to the importer command line.
   static const wchar_t* const switch_names[] = {
     switches::kUserDataDir,
     switches::kLang,
   };
   for (int i = 0; i < arraysize(switch_names); ++i) {
     if (cmdline.HasSwitch(switch_names[i])) {
-      CommandLine::AppendSwitchWithValue(
-          &import_cmd, switch_names[i],
+      import_cmd.AppendSwitchWithValue(
+          switch_names[i],
           cmdline.GetSwitchValue(switch_names[i]));
     }
   }
-  CommandLine::AppendSwitchWithValue(&import_cmd, switches::kImport,
+  import_cmd.CommandLine::AppendSwitchWithValue(switches::kImport,
       EncodeImportParams(browser, items_to_import, parent_window));
 
   // 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)
@@ skipping 61 matching lines @@
 bool FirstRun::SetShowWelcomePagePref() {
   PrefService* local_state = g_browser_process->local_state();
   if (!local_state)
     return false;
   if (!local_state->IsPrefRegistered(prefs::kShouldShowWelcomePage)) {
     local_state->RegisterBooleanPref(prefs::kShouldShowWelcomePage, false);
     local_state->SetBoolean(prefs::kShouldShowWelcomePage, true);
   }
   return true;
 }