Fix not deleting a lockfile or not killing a frozen browser on hostname change

chrome/browser/process_singleton.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_PROCESS_SINGLETON_H_
 #define CHROME_BROWSER_PROCESS_SINGLETON_H_
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
@@ skipping 114 matching lines @@
   // this method, only callers for whom failure is preferred to notifying
   // another process should call this directly.
   bool Create();
 
   // Clear any lock state during shutdown.
   void Cleanup();
 
 #if defined(OS_POSIX) && !defined(OS_ANDROID)
   static void DisablePromptForTesting();
   static void SkipIsChromeProcessCheckForTesting(bool skip);
+  static void SetUserOptedUnlockInUseProfileForTesting(bool set_unlock);
 #endif
 #if defined(OS_WIN)
   // Called to query whether to kill a hung browser process that has visible
   // windows. Return true to allow killing the hung process.
   using ShouldKillRemoteProcessCallback = base::Callback<bool()>;
   void OverrideShouldKillRemoteProcessCallbackForTesting(
       const ShouldKillRemoteProcessCallback& display_dialog_callback);
 #endif
 
  protected:
@@ skipping 32 matching lines @@
   HANDLE lock_file_;
   base::FilePath user_data_dir_;
   ShouldKillRemoteProcessCallback should_kill_remote_process_callback_;
 #elif defined(OS_POSIX) && !defined(OS_ANDROID)
   // Return true if the given pid is one of our child processes.
   // Assumes that the current pid is the root of all pids of the current
   // instance.
   bool IsSameChromeInstance(pid_t pid);
 
   // Extract the process's pid from a symbol link path and if it is on
-  // the same host, kill the process, unlink the lock file and return true.
+  // the same host or is_connected_to_socket is true, kill the process, unlink
+  // the lock file and return true.
   // If the process is part of the same chrome instance, unlink the lock file
   // and return true without killing it.
-  // If the process is on a different host, return false.
-  bool KillProcessByLockPath();
+  // If the process is on a different host and is_connected_to_socket is false,
+  // display profile in use error dialog (on Linux). If user opted to unlock
+  // profile (on Mac OS X by default), unlink the lock file and return true.
+  // Otherwise return false.
+  bool KillProcessByLockPath(bool is_connected_to_socket);
 
   // Default function to kill a process, overridable by tests.
   void KillProcess(int pid);
 
   // Allow overriding for tests.
   base::ProcessId current_pid_;
 
   // Function to call when the other process is hung and needs to be killed.
   // Allows overriding for tests.
   base::Callback<void(int)> kill_callback_;
@@ skipping 13 matching lines @@
   // Helper class for linux specific messages.  LinuxWatcher is ref counted
   // because it posts messages between threads.
   class LinuxWatcher;
   scoped_refptr<LinuxWatcher> watcher_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ProcessSingleton);
 };
 
 #endif  // CHROME_BROWSER_PROCESS_SINGLETON_H_