Report text output and exit code for command-line operations.

chrome/browser/process_singleton_lock.h

 // 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"
 
+class OperationOutput;
+
 // Implements a ProcessSingleton::NotificationCallback that can queue up
 // 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 {
  public:
-  explicit ProcessSingletonLock(
-      const ProcessSingleton::NotificationCallback& original_callback);
+  typedef base::Callback<bool(const CommandLine& command_line,
+                              const base::FilePath& current_directory,
+                              scoped_ptr<OperationOutput> operation_output)>
+      OperationCallback;
+
+  explicit ProcessSingletonLock(const OperationCallback& operation_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;
+  struct DelayedStartupMessage {
+    DelayedStartupMessage(const CommandLine::StringVector& argv,
+                          const base::FilePath& current_directory,
+                          OperationOutput* operation_output);
+    ~DelayedStartupMessage();
+
+    CommandLine::StringVector argv_;
+    base::FilePath current_directory_;
+    OperationOutput* operation_output_;
+  };
 
   bool NotificationCallbackImpl(const CommandLine& command_line,
                                 const base::FilePath& current_directory);
 
   bool locked_;
   std::vector<DelayedStartupMessage> saved_startup_messages_;
-  ProcessSingleton::NotificationCallback original_callback_;
+  OperationCallback operation_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(ProcessSingletonLock);
 };
 
 #endif  // CHROME_BROWSER_PROCESS_SINGLETON_LOCK_H_