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

chrome/browser/first_run_gtk.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 "app/app_switches.h"
 #include "app/resource_bundle.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "chrome/browser/gtk/first_run_dialog.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/result_codes.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "chrome/installer/util/master_preferences.h"
 #include "chrome/installer/util/util_constants.h"
 #include "googleurl/src/gurl.h"
 
-CommandLine* Upgrade::new_command_line_ = NULL;
-
 bool OpenFirstRunDialog(Profile* profile, bool homepage_defined,
                         int import_items,
                         int dont_import_items,
                         bool search_engine_experiment,
                         ProcessSingleton* process_singleton) {
   return FirstRunDialog::Show(profile, process_singleton);
 }
 
 FilePath GetDefaultPrefFilePath(bool create_profile_dir,
                                 const FilePath& user_data_dir) {
@@ skipping 99 matching lines @@
   import_cmd.AppendSwitchWithValue(
       switches::kLang,
       ASCIIToWide(g_browser_process->GetApplicationLocale()));
 
   import_cmd.CommandLine::AppendSwitchWithValue(
       switches::kImportFromFile, import_bookmarks_path);
   // Time to launch the process that is going to do the import. We'll wait
   // for the process to return.
   return base::LaunchApp(import_cmd, true, false, NULL);
 }
-
-#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
-double Upgrade::saved_last_modified_time_of_exe_ = 0;
-
-// static
-bool Upgrade::IsUpdatePendingRestart() {
-  return saved_last_modified_time_of_exe_ !=
-      Upgrade::GetLastModifiedTimeOfExe();
-}
-
-// static
-void Upgrade::SaveLastModifiedTimeOfExe() {
-  saved_last_modified_time_of_exe_ = Upgrade::GetLastModifiedTimeOfExe();
-}
-
-// static
-void Upgrade::RelaunchChromeBrowserWithNewCommandLineIfNeeded() {
-  if (new_command_line_) {
-    if (!base::LaunchApp(*new_command_line_, false, false, NULL)) {
-      DLOG(ERROR) << "Launching a new instance of the browser failed.";
-    } else {
-      DLOG(WARNING) << "Launched a new instance of the browser.";
-    }
-    delete new_command_line_;
-    new_command_line_ = NULL;
-  }
-}
-
-// static
-double Upgrade::GetLastModifiedTimeOfExe() {
-  FilePath exe_file_path;
-  if (!PathService::Get(base::FILE_EXE, &exe_file_path)) {
-    LOG(WARNING) << "Failed to get FilePath object for FILE_EXE.";
-    return saved_last_modified_time_of_exe_;
-  }
-  file_util::FileInfo exe_file_info;
-  if (!file_util::GetFileInfo(exe_file_path, &exe_file_info)) {
-    LOG(WARNING) << "Failed to get FileInfo object for FILE_EXE - "
-                 << exe_file_path.value();
-    return saved_last_modified_time_of_exe_;
-  }
-  return exe_file_info.last_modified.ToDoubleT();
-}
-#endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)