Speed up and re-enable ProcessSingletonPosixTest tests.

chrome/browser/process_singleton.h

Index: chrome/browser/process_singleton.h
diff --git a/chrome/browser/process_singleton.h b/chrome/browser/process_singleton.h
index 300c3a12b7a6a44f51b8501612006c2e5891118d..08dd70e5a600a4ad759ed2c8ffdeb2d8d0ec1166 100644
--- a/chrome/browser/process_singleton.h
+++ b/chrome/browser/process_singleton.h
@@ -105,21 +105,19 @@ class ProcessSingleton : public base::NonThreadSafe {
   // 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)