CommandLine refactoring and cleanup.

chrome/browser/browser_main_win.cc

 // Copyright (c) 2011 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/browser_main.h"
 #include "chrome/browser/browser_main_win.h"
 
 #include <shellapi.h>
 #include <windows.h>
 
@@ skipping 179 matching lines @@
   // Get the function pointer for RegisterApplicationRestart.
   RegisterApplicationRestartProc register_application_restart =
       static_cast<RegisterApplicationRestartProc>(
           library.GetFunctionPointer("RegisterApplicationRestart"));
   if (!register_application_restart)
     return false;
 
   // The Windows Restart Manager expects a string of command line flags only,
   // without the program.
   CommandLine command_line(CommandLine::NO_PROGRAM);
-  command_line.AppendSwitches(parsed_command_line);
-  command_line.AppendArgs(parsed_command_line);
+  command_line.AppendArguments(parsed_command_line, false);
   // Ensure restore last session is set.
   if (!command_line.HasSwitch(switches::kRestoreLastSession))
     command_line.AppendSwitch(switches::kRestoreLastSession);
 
   // Restart Chrome if the computer is restarted as the result of an update.
   // This could be extended to handle crashes, hangs, and patches.
   HRESULT hr = register_application_restart(
       command_line.command_line_string().c_str(),
       RESTART_NO_CRASH | RESTART_NO_HANG | RESTART_NO_PATCH);
   DCHECK(SUCCEEDED(hr)) << "RegisterApplicationRestart failed.";
@@ skipping 101 matching lines @@
       crypto::EnsureNSPRInit();
     }
   }
 };
 
 // static
 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts(
     const MainFunctionParams& parameters) {
   return new BrowserMainPartsWin(parameters);
 }