Remove ShellConnection::WaitForInitialize

mojo/shell/runner/child/runner_connection.cc

Index: mojo/shell/runner/child/runner_connection.cc
diff --git a/mojo/shell/runner/child/runner_connection.cc b/mojo/shell/runner/child/runner_connection.cc
index fc56f6aead49ab604a824e5bdf80ab8c70350e06..f1478d599edd37450ad31cb75dc46519eb19b229 100644
--- a/mojo/shell/runner/child/runner_connection.cc
+++ b/mojo/shell/runner/child/runner_connection.cc
@@ -14,13 +14,9 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/thread_task_runner_handle.h"
-#include "base/threading/thread.h"
-#include "base/threading/thread_checker.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/edk/embedder/scoped_platform_handle.h"
-#include "mojo/message_pump/message_pump_mojo.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/shell/public/interfaces/shell_client_factory.mojom.h"
 #include "mojo/shell/runner/common/switches.h"
@@ -29,137 +25,25 @@ namespace mojo {
 namespace shell {
 namespace {
 
-// Blocks a thread until another thread unblocks it, at which point it unblocks
-// and runs a closure provided by that thread.
-class Blocker {
+class RunnerConnectionImpl : public RunnerConnection,
+                             public mojom::ShellClientFactory {
  public:
-  // Unblocks a Blocker. Safe to copy around to any thread, but must only be
-  // used from a single thread.
-  class Unblocker {
-   public:
-    explicit Unblocker(Blocker* blocker = nullptr) : blocker_(blocker) {}
-    ~Unblocker() {}
-
-    bool IsBlocking() const { return blocker_ != nullptr; }
-
-    void Unblock(base::Closure run_after) {
-      DCHECK(blocker_);
-      DCHECK(blocker_->run_after_.is_null());
-      blocker_->run_after_ = run_after;
-      blocker_->event_.Signal();
-      blocker_ = nullptr;
-    }
-
-   private:
-    Blocker* blocker_;
-
-    // Copy and assign allowed.
-  };
-
-  Blocker() : event_(true, false) {}
-  ~Blocker() {}
-
-  void Block() {
-    DCHECK(run_after_.is_null());
-    event_.Wait();
-    if (!run_after_.is_null())
-      run_after_.Run();
-  }
-
-  Unblocker GetUnblocker() { return Unblocker(this); }
-
- private:
-  base::WaitableEvent event_;
-  base::Closure run_after_;
-
-  DISALLOW_COPY_AND_ASSIGN(Blocker);
-};
-
-using GotApplicationRequestCallback =
-    base::Callback<void(InterfaceRequest<mojom::ShellClient>)>;
-
-void OnGotApplicationRequest(InterfaceRequest<mojom::ShellClient>* out_request,
-                             InterfaceRequest<mojom::ShellClient> request) {
-  *out_request = std::move(request);
-}
-
-class ChildControllerImpl;
-
-class RunnerConnectionImpl : public RunnerConnection {
- public:
-  RunnerConnectionImpl() : controller_thread_("controller_thread") {
-    StartControllerThread();
-  }
-  ~RunnerConnectionImpl() override {
-    controller_runner_->PostTask(
-        FROM_HERE, base::Bind(&RunnerConnectionImpl::ShutdownOnControllerThread,
-                              base::Unretained(this)));
-    controller_thread_.Stop();
+  RunnerConnectionImpl(mojo::ShellConnection* shell_connetion,
+                       mojom::ShellClientFactoryRequest client_factory_request,
+                       bool exit_on_error)
+      : shell_connection_(shell_connetion),
+        binding_(this, std::move(client_factory_request)),
+        exit_on_error_(exit_on_error) {
+    binding_.set_connection_error_handler([this] { OnConnectionError(); });
   }
 
-  // Returns true if a connection to the runner has been established and
-  // |request| has been modified, false if no connection was established.
-  bool WaitForApplicationRequest(InterfaceRequest<mojom::ShellClient>* request,
-                                 ScopedMessagePipeHandle handle,
-                                 bool exit_on_error);
-
-  ChildControllerImpl* controller() const { return controller_.get(); }
-
-  void set_controller(scoped_ptr<ChildControllerImpl> controller) {
-    controller_ = std::move(controller);
-  }
+  ~RunnerConnectionImpl() override {}
 
  private:
-  void StartControllerThread() {
-    base::Thread::Options controller_thread_options;
-    controller_thread_options.message_loop_type =
-        base::MessageLoop::TYPE_CUSTOM;
-    controller_thread_options.message_pump_factory =
-        base::Bind(&common::MessagePumpMojo::Create);
-    CHECK(controller_thread_.StartWithOptions(controller_thread_options));
-    controller_runner_ = controller_thread_.task_runner().get();
-    CHECK(controller_runner_.get());
-  }
-
-  void ShutdownOnControllerThread() { controller_.reset(); }
-
-  base::Thread controller_thread_;
-  scoped_refptr<base::SingleThreadTaskRunner> controller_runner_;
-
-  // Accessed only on the controller thread.
-  scoped_ptr<ChildControllerImpl> controller_;
-
-  DISALLOW_COPY_AND_ASSIGN(RunnerConnectionImpl);
-};
-
-class ChildControllerImpl : public mojom::ShellClientFactory {
- public:
-  ~ChildControllerImpl() override {
-    DCHECK(thread_checker_.CalledOnValidThread());
-  }
-
-  // To be executed on the controller thread. Creates the |ChildController|,
-  // etc.
-  static void Create(RunnerConnectionImpl* connection,
-                     const GotApplicationRequestCallback& callback,
-                     ScopedMessagePipeHandle runner_handle,
-                     const Blocker::Unblocker& unblocker,
-                     bool exit_on_error) {
-    DCHECK(connection);
-    DCHECK(!connection->controller());
-
-    scoped_ptr<ChildControllerImpl> impl(
-        new ChildControllerImpl(connection, callback, unblocker,
-                                exit_on_error));
-
-    impl->Bind(std::move(runner_handle));
-
-    connection->set_controller(std::move(impl));
-  }
-
-  void Bind(ScopedMessagePipeHandle handle) {
-    binding_.Bind(std::move(handle));
-    binding_.set_connection_error_handler([this]() { OnConnectionError(); });
+  // mojom::ShellClientFactory:
+  void CreateShellClient(mojom::ShellClientRequest client_request,
+                         const String& name) override {
+    shell_connection_->BindToRequest(std::move(client_request));
   }
 
   void OnConnectionError() {
@@ -168,103 +52,32 @@ class ChildControllerImpl : public mojom::ShellClientFactory {
     DLOG(ERROR) << "Connection error to the shell.";
     if (exit_on_error_)
       _exit(1);
-    else
-      UnblockConnection(nullptr);
-  }
-
-  // |mojom::ShellClientFactory| methods:
-  void CreateShellClient(mojom::ShellClientRequest request,
-                         const String& name) override {
-    UnblockConnection(std::move(request));
   }
 
- private:
-  ChildControllerImpl(RunnerConnectionImpl* connection,
-                      const GotApplicationRequestCallback& callback,
-                      const Blocker::Unblocker& unblocker,
-                      bool exit_on_error)
-      : connection_(connection),
-        callback_(callback),
-        unblocker_(unblocker),
-        binding_(this),
-        exit_on_error_(exit_on_error) {}
-
-  static void ReturnApplicationRequestOnMainThread(
-      const GotApplicationRequestCallback& callback,
-      InterfaceRequest<mojom::ShellClient> request) {
-    callback.Run(std::move(request));
-  }
-
-  void UnblockConnection(mojom::ShellClientRequest request) {
-    DCHECK(thread_checker_.CalledOnValidThread());
-    if (unblocker_.IsBlocking()) {
-      unblocker_.Unblock(
-          base::Bind(&ChildControllerImpl::ReturnApplicationRequestOnMainThread,
-                     callback_, base::Passed(&request)));
-    }
-  }
-
-  base::ThreadChecker thread_checker_;
-  RunnerConnectionImpl* const connection_;
-  GotApplicationRequestCallback callback_;
-  Blocker::Unblocker unblocker_;
-
+  mojo::ShellConnection* const shell_connection_;
   Binding<mojom::ShellClientFactory> binding_;
+  const bool exit_on_error_;
 
-  bool exit_on_error_;
-
-  DISALLOW_COPY_AND_ASSIGN(ChildControllerImpl);
+  DISALLOW_COPY_AND_ASSIGN(RunnerConnectionImpl);
 };
 
-bool RunnerConnectionImpl::WaitForApplicationRequest(
-    InterfaceRequest<mojom::ShellClient>* request,
-    ScopedMessagePipeHandle handle,
-    bool exit_on_error) {
-  // If a valid message pipe to the runner was not provided, look for one on the
-  // command line.
-  if (!handle.is_valid()) {
-    edk::ScopedPlatformHandle platform_channel =
-        edk::PlatformChannelPair::PassClientHandleFromParentProcess(
-            *base::CommandLine::ForCurrentProcess());
-    if (!platform_channel.is_valid())
-      return false;
-    edk::SetParentPipeHandle(std::move(platform_channel));
-    std::string primordial_pipe_token =
-        base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-            switches::kPrimordialPipeToken);
-    handle = edk::CreateChildMessagePipe(primordial_pipe_token);
-  }
-
-  DCHECK(handle.is_valid());
-
-  Blocker blocker;
-  controller_runner_->PostTask(
-      FROM_HERE,
-      base::Bind(
-          &ChildControllerImpl::Create, base::Unretained(this),
-          base::Bind(&OnGotApplicationRequest, request), base::Passed(&handle),
-          blocker.GetUnblocker(), exit_on_error));
-  blocker.Block();
-
-  return request->is_pending();
-}
-
 }  // namespace
 
 RunnerConnection::~RunnerConnection() {}
 
 // static
-RunnerConnection* RunnerConnection::ConnectToRunner(
-    InterfaceRequest<mojom::ShellClient>* request,
-    ScopedMessagePipeHandle handle,
+scoped_ptr<RunnerConnection> RunnerConnection::Create(
+    mojo::ShellConnection* shell_connection,
     bool exit_on_error) {
-  RunnerConnectionImpl* connection = new RunnerConnectionImpl;
-  if (!connection->WaitForApplicationRequest(
-      request, std::move(handle), exit_on_error)) {
-    delete connection;
-    return nullptr;
-  }
-  return connection;
+  std::string primordial_pipe_token =
+      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+          switches::kPrimordialPipeToken);
+  mojom::ShellClientFactoryRequest client_factory_request;
+  client_factory_request.Bind(
+      edk::CreateChildMessagePipe(primordial_pipe_token));
+
+  return make_scoped_ptr(new RunnerConnectionImpl(
+      shell_connection, std::move(client_factory_request), exit_on_error));
 }
 
 RunnerConnection::RunnerConnection() {}