summaryrefslogtreecommitdiffstats
path: root/chrome/browser/process_singleton.h
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-17 21:00:18 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-17 21:00:18 +0000
commitc0d297956354b9c74fdcfb717efb272a772f4315 (patch)
tree94beb2ca93a6e9ad36952c6ef163f67f3da58b1e /chrome/browser/process_singleton.h
parent5d8128106e8bae8784d9468706198c61c505641b (diff)
downloadchromium_src-c0d297956354b9c74fdcfb717efb272a772f4315.zip
chromium_src-c0d297956354b9c74fdcfb717efb272a772f4315.tar.gz
chromium_src-c0d297956354b9c74fdcfb717efb272a772f4315.tar.bz2
linux: expose the ProcessSingleton timeout to speed tests
We have a 20-second timeout normally, but for testing purposes 1 second is plenty. Review URL: http://codereview.chromium.org/209018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26483 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/process_singleton.h')
-rw-r--r--chrome/browser/process_singleton.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/process_singleton.h b/chrome/browser/process_singleton.h
index 122618f..e06a7e8 100644
--- a/chrome/browser/process_singleton.h
+++ b/chrome/browser/process_singleton.h
@@ -40,6 +40,7 @@ class ProcessSingleton : public NonThreadSafe {
explicit ProcessSingleton(const FilePath& user_data_dir);
~ProcessSingleton();
+ // Notify another process, if available.
// Returns true if another process was found and notified, false if we
// should continue with this process.
// Windows code roughly based on Mozilla.
@@ -49,6 +50,12 @@ class ProcessSingleton : public NonThreadSafe {
// first one, so this function won't find it.
NotifyResult NotifyOtherProcess();
+#if defined(OS_LINUX)
+ // Exposed for testing. We use a timeout on Linux, and in tests we want
+ // this timeout to be short.
+ NotifyResult NotifyOtherProcessWithTimeout(int timeout_seconds);
+#endif
+
// Sets ourself up as the singleton instance.
void Create();