Remove one-time flags when restarting after update....

chrome/browser/browser_shutdown.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/browser_shutdown.h"
 
 #include <string>
 
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
@@ skipping 15 matching lines @@
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/plugin_process_host.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/chrome_plugin_lib.h"
+#include "chrome/common/switch_utils.h"
 #include "net/predictor_api.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/rlz/rlz.h"
 #endif
 
 using base::Time;
 using base::TimeDelta;
 
 namespace browser_shutdown {
@@ skipping 123 matching lines @@
     // the Restore Last Session flag. Note that Chrome can be launched (ie.
     // through ShellExecute on Windows) with a switch argument terminator at
     // the end (double dash, as described in b/1366444) plus a URL,
     // which prevents us from appending to the command line directly (issue
     // 46182). We therefore use GetSwitches to copy the command line (it stops
     // at the switch argument terminator).
     CommandLine old_cl(*CommandLine::ForCurrentProcess());
     scoped_ptr<CommandLine> new_cl(new CommandLine(old_cl.GetProgram()));
     std::map<std::string, CommandLine::StringType> switches =
         old_cl.GetSwitches();
+    // Remove the switches that shouldn't persist across restart.
+    switches::RemoveSwitchesForAutostart(&switches);
     // Append the old switches to the new command line.
     for (std::map<std::string, CommandLine::StringType>::const_iterator i =
         switches.begin(); i != switches.end(); ++i) {
       CommandLine::StringType switch_value = i->second;
       if (!switch_value.empty())
         new_cl->AppendSwitchNative(i->first, i->second);
       else
         new_cl->AppendSwitch(i->first);
     }
     // Ensure restore last session is set.
@@ skipping 102 matching lines @@
 
 bool ShuttingDownWithoutClosingBrowsers() {
 #if defined(USE_X11)
   if (GetShutdownType() == browser_shutdown::END_SESSION)
     return true;
 #endif
   return false;
 }
 
 }  // namespace browser_shutdown