Extract locking behaviour from ProcessSingleton.

chrome/browser/process_singleton_startup_lock.cc

Index: chrome/browser/process_singleton_startup_lock.cc
diff --git a/chrome/browser/process_singleton_startup_lock.cc b/chrome/browser/process_singleton_startup_lock.cc
new file mode 100644
index 0000000000000000000000000000000000000000..cd3c0f7045dff4c64997a4b1b47c9f0b8290df02
--- /dev/null
+++ b/chrome/browser/process_singleton_startup_lock.cc
@@ -0,0 +1,53 @@
+// 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.
+
+#include "chrome/browser/process_singleton_startup_lock.h"
+
+#include "base/bind.h"
+#include "base/logging.h"
+
+ProcessSingletonStartupLock::ProcessSingletonStartupLock(
+    const ProcessSingleton::NotificationCallback& original_callback)
+    : locked_(true),
+      original_callback_(original_callback) {}
+
+ProcessSingletonStartupLock::~ProcessSingletonStartupLock() {}
+
+ProcessSingleton::NotificationCallback
+ProcessSingletonStartupLock::AsNotificationCallback() {
+  return base::Bind(&ProcessSingletonStartupLock::NotificationCallbackImpl,
+                    base::Unretained(this));
+}
+
+void ProcessSingletonStartupLock::Unlock() {
+  DCHECK(CalledOnValidThread());
+  locked_ = false;
+
+  // Replay the command lines of the messages which were received while the
+  // ProcessSingleton was locked. Only replay each message once.
+  std::set<DelayedStartupMessage> replayed_messages;
+  for (std::vector<DelayedStartupMessage>::const_iterator it =
+           saved_startup_messages_.begin();

[gab, 2013/03/28 13:45:53]

See, this is what I mean by 4 spaces indent when breaking the previous line
before the end of the statement.
Why would it make sense here, but not if the operator is '==' (ref. one of our
recent argument).

To me it only makes sense to wrap to the same indent as the previous line if the
previous line ends with:
;
,
&&
||
(and I might be forgetting some clear statement ending operators)

Where as if the previous line ends with '==', '>', is the middle of a method
definition, etc. I feel 4 spaces indent makes sense if only to indicate to the
reader: "hey, we weren't done, this is the remainder of the previous line".

(couldn't find a clear statement of that in the style-guide though... :( )

[erikwright (departed), 2013/04/04 01:39:51]

I honestly don't know. In the absence of anything else, though, I'll trust
google-c-style.el, which is presumably what many other developers are using and
therefore less likely to be constantly flip-flopping than me overriding its
default behaviour.

+       it != saved_startup_messages_.end(); ++it) {
+    if (replayed_messages.find(*it) != replayed_messages.end())
+      continue;
+    original_callback_.Run(CommandLine(it->first), it->second);
+    replayed_messages.insert(*it);
+  }
+  saved_startup_messages_.clear();
+}
+
+bool ProcessSingletonStartupLock::NotificationCallbackImpl(
+    const CommandLine& command_line,
+    const base::FilePath& current_directory) {
+  if (locked_) {
+    // If locked, it means we are not ready to process this message because
+    // we are probably in a first run critical phase.
+    saved_startup_messages_.push_back(
+        std::make_pair(command_line.argv(), current_directory));
+    return true;
+  } else {
+    return original_callback_.Run(command_line, current_directory);
+  }
+}