Revert r46023: "Detect new instance of the browser when running in the background in persistent"

chrome/browser/browser_process_impl.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_process_impl.h"
 
-#include <map>
-
 #include "app/clipboard/clipboard.h"
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/thread.h"
 #include "base/waitable_event.h"
 #include "chrome/browser/appcache/chrome_appcache_service.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_main.h"
@@ skipping 39 matching lines @@
 
 #if defined(OS_WIN)
 #include "views/focus/view_storage.h"
 #endif
 
 #if defined(IPC_MESSAGE_LOG_ENABLED)
 #include "chrome/common/plugin_messages.h"
 #include "chrome/common/render_messages.h"
 #endif
 
-#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
-// How often to check if the persistent instance of Chrome needs to restart
-// to install an update.
-static const int kUpdateCheckIntervalHours = 6;
-#endif
-
 BrowserProcessImpl::BrowserProcessImpl(const CommandLine& command_line)
     : created_resource_dispatcher_host_(false),
       created_metrics_service_(false),
       created_io_thread_(false),
       created_file_thread_(false),
       created_db_thread_(false),
       created_process_launcher_thread_(false),
       created_profile_manager_(false),
       created_local_state_(false),
       created_icon_manager_(false),
@@ skipping 365 matching lines @@
   void RetainCallee(BrowserProcessImpl* process) {}
   void ReleaseCallee(BrowserProcessImpl* process) {}
 };
 
 void BrowserProcessImpl::CheckForInspectorFiles() {
   file_thread()->message_loop()->PostTask
       (FROM_HERE,
        NewRunnableMethod(this, &BrowserProcessImpl::DoInspectorFilesCheck));
 }
 
-#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+#if defined(OS_WIN)
 void BrowserProcessImpl::StartAutoupdateTimer() {
   autoupdate_timer_.Start(
-      TimeDelta::FromHours(kUpdateCheckIntervalHours),
+      TimeDelta::FromHours(google_update::kUpdateCheckInvervalHours),
       this,
       &BrowserProcessImpl::OnAutoupdateTimer);
 }
-#endif
+#endif  //  OS_WIN
 
 #if defined(IPC_MESSAGE_LOG_ENABLED)
 
 void BrowserProcessImpl::SetIPCLoggingEnabled(bool enable) {
   // First enable myself.
   if (enable)
     IPC::Logging::current()->Enable();
   else
     IPC::Logging::current()->Disable();
 
@@ skipping 32 matching lines @@
   bool result = false;
 
   FilePath inspector_dir;
   if (PathService::Get(chrome::DIR_INSPECTOR, &inspector_dir)) {
     result = file_util::PathExists(inspector_dir);
   }
 
   have_inspector_files_ = result;
 }
 
-// Mac is currently not supported.
-#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+#if defined(OS_WIN)  // Linux doesn't do rename on restart, and Mac is currently
+                     // not supported.
 
 bool BrowserProcessImpl::CanAutorestartForUpdate() const {
   // Check if browser is in the background and if it needs to be restarted to
   // apply a pending update.
   return BrowserList::IsInPersistentMode() && Upgrade::IsUpdatePendingRestart();
 }
 
 // Switches enumerated here will be removed when a background instance of
 // Chrome restarts itself. If your key is designed to only be used once,
 // or if it does not make sense when restarting a background instance to
 // pick up an automatic update, be sure to add it to this list.
 const char* const kSwitchesToRemoveOnAutorestart[] = {
     switches::kApp,
     switches::kFirstRun,
     switches::kImport,
     switches::kImportFromFile,
     switches::kMakeDefaultBrowser
 };
 
 void BrowserProcessImpl::RestartPersistentInstance() {
   CommandLine* old_cl = CommandLine::ForCurrentProcess();
-  scoped_ptr<CommandLine> new_cl(new CommandLine(old_cl->GetProgram()));
+  CommandLine new_cl(old_cl->GetProgram());
 
   std::map<std::string, CommandLine::StringType> switches =
       old_cl->GetSwitches();
 
   // Remove the keys that we shouldn't pass through during restart.
-  for (size_t i = 0; i < arraysize(kSwitchesToRemoveOnAutorestart); i++) {
+  for (int i = 0; i < arraysize(kSwitchesToRemoveOnAutorestart); i++) {
     switches.erase(kSwitchesToRemoveOnAutorestart[i]);
   }
 
   // Append the rest of the switches (along with their values, if any)
   // 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.length() > 0) {
-        new_cl->AppendSwitchWithValue(i->first, i->second);
+        new_cl.AppendSwitchWithValue(i->first, i->second);
       } else {
-        new_cl->AppendSwitch(i->first);
+        new_cl.AppendSwitch(i->first);
       }
   }
 
   // TODO(atwilson): Uncomment the following two lines to add the "persistence"
   // switch when the corresponding CL is committed.
-  // if (!new_cl->HasSwitch(switches::kLongLivedExtensions))
-  //  new_cl->AppendSwitch(switches::kLongLivedExtensions);
+  // if (!new_cl.HasSwitch(switches::kLongLivedExtensions))
+  //  new_cl.AppendSwitch(switches::kLongLivedExtensions);
 
-  DLOG(WARNING) << "Shutting down current instance of the browser.";
-  BrowserList::CloseAllBrowsersAndExit();
-
-  // Transfer ownership to Upgrade.
-  Upgrade::SetNewCommandLine(new_cl.release());
+  if (Upgrade::RelaunchChromeBrowser(new_cl)) {
+    BrowserList::CloseAllBrowsersAndExit();
+  } else {
+    DLOG(ERROR) << "Could not restart browser for autoupdate.";
+  }
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
-    DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartPersistentInstance();
   }
 }
 
-#endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+#endif