Extract locking behaviour from ProcessSingleton.

chrome/browser/process_singleton_lock.h

Index: chrome/browser/process_singleton_lock.h
diff --git a/chrome/browser/process_singleton_lock.h b/chrome/browser/process_singleton_lock.h
new file mode 100644
index 0000000000000000000000000000000000000000..2775dc0108698c5cfc50b8138406532ca80ff4a6
--- /dev/null
+++ b/chrome/browser/process_singleton_lock.h
@@ -0,0 +1,55 @@
+// Copyright (c) 2013 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_LOCK_H_
+#define CHROME_BROWSER_PROCESS_SINGLETON_LOCK_H_
+
+#include <set>
+#include <utility>
+#include <vector>
+
+#include "base/basictypes.h"
+#include "base/command_line.h"
+#include "base/files/file_path.h"
+#include "base/threading/non_thread_safe.h"
+#include "chrome/browser/process_singleton.h"
+
+// Implements a ProcessSingleton::NotificationCallback that can queue up

[gab, 2013/03/27 18:03:26]

Same comment here about "Implements".

[erikwright (departed), 2013/03/28 03:16:34]

Done.

+// command-line invocations during startup and execute them when startup
+// completes. The object starts in a locked state. |Unlock()| must be called
+// when the process is prepared to handle command-line invocations.
+//
+// Once unlocked, notifications are forwarded to a wrapped NotificationCallback.
+class ProcessSingletonLock : public base::NonThreadSafe {

[gab, 2013/03/27 18:03:26]

Add to the documentation that ProcessSingletonLock is initialized in its locked
state.

[erikwright (departed), 2013/03/27 18:28:44]

Is the comment on line 20 ("The object starts in a locked state.") sufficient or
does the fact that you overlooked it imply that it should be made a separate
paragraph (i.e., insert LF-LF after "completes." on line 20)?

[gab, 2013/03/27 18:33:20]

Oh, I did overlook that, although I read the comment more than once... so yes I
guess having it in a new paragraph would help :).

[erikwright (departed), 2013/03/28 03:16:34]

Done.

+ public:
+  explicit ProcessSingletonLock(
+      const ProcessSingleton::NotificationCallback& original_callback);
+  ~ProcessSingletonLock();
+
+  // Returns the callback that should be supplied to ProcessSingleton.
+  // The callback is only valid during the lifetime of the ProcessSingletonLock
+  // instance.
+  ProcessSingleton::NotificationCallback AsNotificationCallback();
+
+  // Executes previously queued command-line invocations and allows future
+  // invocations to be executed immediately.
+  void Unlock();
+
+  bool locked() { return locked_; }
+
+ private:
+  typedef std::pair<CommandLine::StringVector, base::FilePath>
+      DelayedStartupMessage;
+
+  bool NotificationCallbackImpl(const CommandLine& command_line,
+                                const base::FilePath& current_directory);
+
+  bool locked_;
+  std::vector<DelayedStartupMessage> saved_startup_messages_;
+  ProcessSingleton::NotificationCallback original_callback_;
+
+  DISALLOW_COPY_AND_ASSIGN(ProcessSingletonLock);
+};
+
+#endif  // CHROME_BROWSER_PROCESS_SINGLETON_LOCK_H_