Retry 114494 - Remove BindStateHolder and have Bind() return a Callback<> object directly."

chrome/browser/chromeos/process_proxy/process_proxy.cc

 // Copyright (c) 2011 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/chromeos/process_proxy/process_proxy.h"
 
 #include <cstdio>
 #include <fcntl.h>
 #include <signal.h>
 
@@ skipping 78 matching lines @@
 
   // |watch| thread is blocked by |output_watcher| from now on.
   watch_thread->message_loop()->PostTask(FROM_HERE,
       base::Bind(&ProcessOutputWatcher::Start,
                  base::Unretained(output_watcher)));
   watcher_started_ = true;
   return true;
 }
 
 void ProcessProxy::OnProcessOutput(ProcessOutputType type,
-                               const std::string& output) {
+                                   const std::string& output) {
   // We have to check if callback is set on FILE thread..
   if (!content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE)) {
     content::BrowserThread::PostTask(content::BrowserThread::FILE, FROM_HERE,
         base::Bind(&ProcessProxy::OnProcessOutput, this, type, output));
     return;
   }
 
   // We may receive some output even after Close was called (crosh process does
   // not have to quit instantly, or there may be some trailing data left in
   // output stream fds). In that case owner of the callback may be gone so we
@@ skipping 103 matching lines @@
   ClearPipe(in_pipe_);
   ClearPipe(out_pipe_);
   ClearPipe(err_pipe_);
   ClearPipe(shutdown_pipe_);
 }
 
 void ProcessProxy::ClearPipe(int* pipe) {
   pipe[PIPE_END_READ] = kInvalidFd;
   pipe[PIPE_END_WRITE] = kInvalidFd;
 }