Speed up and re-enable ProcessSingletonPosixTest tests.

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 87 matching lines @@
   // Returns true if another process was found and notified, false if we should
   // continue with the current process.
   // On Windows, Create() has to be called before this.
   NotifyResult NotifyOtherProcess();
 
 #if defined(OS_POSIX) && !defined(OS_ANDROID)
   // Exposed for testing.  We use a timeout on Linux, and in tests we want
   // this timeout to be short.
   NotifyResult NotifyOtherProcessWithTimeout(
       const base::CommandLine& command_line,
-      int timeout_seconds,
+      int retry_attempts,
+      const base::TimeDelta& timeout_interval,

[Nico, 2014/09/08 19:04:18]

nit: i'd just call this timeout I think, the type communicates the rest

[mattm, 2014/09/09 00:06:14]

Done.

       bool kill_unresponsive);
   NotifyResult NotifyOtherProcessWithTimeoutOrCreate(
       const base::CommandLine& command_line,
-      int timeout_seconds);
+      int retry_attempts,
+      const base::TimeDelta& timeout_interval);
   void OverrideCurrentPidForTesting(base::ProcessId pid);
   void OverrideKillCallbackForTesting(
       const base::Callback<void(int)>& callback);
 #endif
 
  private:
-  // Timeout for the current browser process to respond. 20 seconds should be
-  // enough.
-  static const int kTimeoutInSeconds = 20;
-
   NotificationCallback notification_callback_;  // Handler for notifications.
 
 #if defined(OS_WIN)
   bool EscapeVirtualization(const base::FilePath& user_data_dir);
 
   HWND remote_window_;  // The HWND_MESSAGE of another browser.
   base::win::MessageWindow window_;  // The message-only window.
   bool is_virtualized_;  // Stuck inside Microsoft Softricity VM environment.
   HANDLE lock_file_;
   base::FilePath user_data_dir_;
@@ skipping 35 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_