Revert of Move content's shell connections to the IO thread

content/common/mojo/mojo_shell_connection_impl.cc

Index: content/common/mojo/mojo_shell_connection_impl.cc
diff --git a/content/common/mojo/mojo_shell_connection_impl.cc b/content/common/mojo/mojo_shell_connection_impl.cc
index ee7ff9767d7ee411493ea079b65e2bca9997e386..5311ba6c4c05221a6b298f39b4a61a334e3c1c66 100644
--- a/content/common/mojo/mojo_shell_connection_impl.cc
+++ b/content/common/mojo/mojo_shell_connection_impl.cc
@@ -4,401 +4,180 @@
 
 #include "content/common/mojo/mojo_shell_connection_impl.h"
 
-#include <queue>
-#include <utility>
-#include <vector>
-
 #include "base/bind.h"
-#include "base/callback_helpers.h"
 #include "base/lazy_instance.h"
-#include "base/macros.h"
 #include "base/memory/ptr_util.h"
-#include "base/threading/thread_checker.h"
+#include "base/threading/thread_local.h"
 #include "content/common/mojo/embedded_application_runner.h"
-#include "content/public/common/connection_filter.h"
-#include "mojo/public/cpp/bindings/binding_set.h"
-#include "mojo/public/cpp/system/message_pipe.h"
 #include "services/shell/public/cpp/service.h"
 #include "services/shell/public/cpp/service_context.h"
-#include "services/shell/public/interfaces/service_factory.mojom.h"
 #include "services/shell/runner/common/client_util.h"
 
 namespace content {
 namespace {
 
-base::LazyInstance<std::unique_ptr<MojoShellConnection>>::Leaky
-    g_connection_for_process = LAZY_INSTANCE_INITIALIZER;
+using MojoShellConnectionPtr =
+    base::ThreadLocalPointer<MojoShellConnection>;
+
+// Env is thread local so that aura may be used on multiple threads.
+base::LazyInstance<MojoShellConnectionPtr>::Leaky lazy_tls_ptr =
+    LAZY_INSTANCE_INITIALIZER;
 
 MojoShellConnection::Factory* mojo_shell_connection_factory = nullptr;
 
 }  // namespace
 
-// A ref-counted object which owns the IO thread state of a
-// MojoShellConnectionImpl. This includes Service and ServiceFactory
-// bindings.
-class MojoShellConnectionImpl::IOThreadContext
-    : public base::RefCountedThreadSafe<IOThreadContext>,
-      public shell::Service,
-      public shell::InterfaceFactory<shell::mojom::ServiceFactory>,
-      public shell::mojom::ServiceFactory {
- public:
-  using InitializeCallback = base::Callback<void(const shell::Identity&)>;
-  using ServiceFactoryCallback =
-      base::Callback<void(shell::mojom::ServiceRequest, const mojo::String&)>;
-
-  IOThreadContext(shell::mojom::ServiceRequest service_request,
-                  scoped_refptr<base::SequencedTaskRunner> io_task_runner,
-                  std::unique_ptr<shell::Connector> io_thread_connector,
-                  shell::mojom::ConnectorRequest connector_request)
-      : pending_service_request_(std::move(service_request)),
-        io_task_runner_(io_task_runner),
-        io_thread_connector_(std::move(io_thread_connector)),
-        pending_connector_request_(std::move(connector_request)) {
-    // This will be reattached by any of the IO thread functions on first call.
-    io_thread_checker_.DetachFromThread();
-  }
-
-  // Safe to call from any thread.
-  void Start(const InitializeCallback& initialize_callback,
-             const ServiceFactoryCallback& create_service_callback,
-             const base::Closure& stop_callback) {
-    DCHECK(!started_);
-
-    started_ = true;
-    callback_task_runner_ = base::ThreadTaskRunnerHandle::Get();
-    initialize_handler_ = initialize_callback;
-    create_service_callback_ = create_service_callback;
-    stop_callback_ = stop_callback;
-    io_task_runner_->PostTask(
-        FROM_HERE, base::Bind(&IOThreadContext::StartOnIOThread, this));
-  }
-
-  // Safe to call from whichever thread called Start() (or may have called
-  // Start()). Must be called before IO thread shutdown.
-  void ShutDown() {
-    if (!started_)
-      return;
-
-    bool posted = io_task_runner_->PostTask(
-        FROM_HERE, base::Bind(&IOThreadContext::ShutDownOnIOThread, this));
-    DCHECK(posted);
-  }
-
-  // Safe to call any time before Start() is called.
-  void AddConnectionFilter(std::unique_ptr<ConnectionFilter> filter) {
-    DCHECK(!started_);
-    connection_filters_.emplace_back(std::move(filter));
-  }
-
-  // Safe to call any time before Start() is called.
-  void SetDefaultBinderForBrowserConnection(
-      const shell::InterfaceRegistry::Binder& binder) {
-    DCHECK(!started_);
-    default_browser_binder_ = base::Bind(
-        &IOThreadContext::CallBinderOnTaskRunner,
-        base::ThreadTaskRunnerHandle::Get(), binder);
-  }
-
-  // Safe to call any time after Start() is called.
-  void GetRemoteInterface(const mojo::String& interface_name,
-                          mojo::ScopedMessagePipeHandle request_handle) {
-    DCHECK(started_);
-    io_task_runner_->PostTask(
-        FROM_HERE,
-        base::Bind(&IOThreadContext::GetRemoteInterfaceOnIOThread, this,
-                   interface_name, base::Passed(&request_handle)));
-  }
-
- private:
-  friend class base::RefCountedThreadSafe<IOThreadContext>;
-
-  ~IOThreadContext() override {}
-
-  void StartOnIOThread() {
-    // Should bind |io_thread_checker_| to the context's thread.
-    DCHECK(io_thread_checker_.CalledOnValidThread());
-    service_context_.reset(new shell::ServiceContext(
-        this, std::move(pending_service_request_),
-        std::move(io_thread_connector_),
-        std::move(pending_connector_request_)));
-  }
-
-  void ShutDownOnIOThread() {
-    DCHECK(io_thread_checker_.CalledOnValidThread());
-    service_context_.reset();
-    factory_bindings_.CloseAllBindings();
-  }
-
-  void GetRemoteInterfaceOnIOThread(
-      const mojo::String& interface_name,
-      mojo::ScopedMessagePipeHandle request_handle) {
-    DCHECK(io_thread_checker_.CalledOnValidThread());
-    if (browser_connection_) {
-      browser_connection_->GetRemoteInterfaces()->GetInterface(
-          interface_name, std::move(request_handle));
-    } else {
-      pending_remote_interface_requests_.emplace(interface_name,
-                                                 std::move(request_handle));
-    }
-  }
-
-  void OnBrowserConnectionLost() {
-    DCHECK(io_thread_checker_.CalledOnValidThread());
-    browser_connection_ = nullptr;
-  }
-
-  /////////////////////////////////////////////////////////////////////////////
-  // shell::Service implementation
-
-  void OnStart(shell::Connector* connector,
-               const shell::Identity& identity,
-               uint32_t id) override {
-    DCHECK(io_thread_checker_.CalledOnValidThread());
-    DCHECK(!initialize_handler_.is_null());
-
-    InitializeCallback handler = base::ResetAndReturn(&initialize_handler_);
-    callback_task_runner_->PostTask(FROM_HERE, base::Bind(handler, identity));
-  }
-
-  bool OnConnect(shell::Connection* connection) override {
-    DCHECK(io_thread_checker_.CalledOnValidThread());
-    std::string remote_app = connection->GetRemoteIdentity().name();
-    if (remote_app == "mojo:shell") {
-      // Only expose the SCF interface to the shell.
-      connection->AddInterface<shell::mojom::ServiceFactory>(this);
-      return true;
-    }
-
-    bool accept = false;
-    for (auto& filter : connection_filters_) {
-      accept = accept ||
-        filter->OnConnect(connection, service_context_->connector());
-    }
-
-    // Capture the browser connection if possible.
-    if (remote_app == "exe:content_browser" && !browser_connection_) {
-      browser_connection_ = connection;
-      connection->GetInterfaceRegistry()->set_default_binder(
-          default_browser_binder_);
-      connection->SetConnectionLostClosure(
-          base::Bind(&IOThreadContext::OnBrowserConnectionLost, this));
-      shell::InterfaceProvider* remote_interfaces =
-          connection->GetRemoteInterfaces();
-
-      // Flush any pending outgoing interface requests.
-      while (!pending_remote_interface_requests_.empty()) {
-        auto& request = pending_remote_interface_requests_.front();
-        remote_interfaces->GetInterface(
-            request.first, std::move(request.second));
-        pending_remote_interface_requests_.pop();
-      }
-      return true;
-    }
-
-    // If no filters were interested, reject the connection.
-    return accept;
-  }
-
-  bool OnStop() override {
-    callback_task_runner_->PostTask(FROM_HERE, stop_callback_);
+////////////////////////////////////////////////////////////////////////////////
+// MojoShellConnection, public:
+
+// static
+void MojoShellConnection::SetForProcess(
+    std::unique_ptr<MojoShellConnection> connection) {
+  DCHECK(!lazy_tls_ptr.Pointer()->Get());
+  lazy_tls_ptr.Pointer()->Set(connection.release());
+}
+
+// static
+MojoShellConnection* MojoShellConnection::GetForProcess() {
+  return lazy_tls_ptr.Pointer()->Get();
+}
+
+// static
+void MojoShellConnection::DestroyForProcess() {
+  // This joins the shell controller thread.
+  delete GetForProcess();
+  lazy_tls_ptr.Pointer()->Set(nullptr);
+}
+
+// static
+void MojoShellConnection::SetFactoryForTest(Factory* factory) {
+  DCHECK(!lazy_tls_ptr.Pointer()->Get());
+  mojo_shell_connection_factory = factory;
+}
+
+// static
+std::unique_ptr<MojoShellConnection> MojoShellConnection::Create(
+    shell::mojom::ServiceRequest request) {
+  if (mojo_shell_connection_factory)
+    return mojo_shell_connection_factory->Run();
+  return base::WrapUnique(new MojoShellConnectionImpl(std::move(request)));
+}
+
+MojoShellConnection::~MojoShellConnection() {}
+
+////////////////////////////////////////////////////////////////////////////////
+// MojoShellConnectionImpl, public:
+
+MojoShellConnectionImpl::MojoShellConnectionImpl(
+    shell::mojom::ServiceRequest request)
+    : shell_connection_(new shell::ServiceContext(this, std::move(request))) {}
+
+MojoShellConnectionImpl::~MojoShellConnectionImpl() {}
+
+////////////////////////////////////////////////////////////////////////////////
+// MojoShellConnectionImpl, shell::Service implementation:
+
+void MojoShellConnectionImpl::OnStart(shell::Connector* connector,
+                                      const shell::Identity& identity,
+                                      uint32_t id) {
+  for (auto& client : embedded_services_)
+    client->OnStart(connector, identity, id);
+}
+
+bool MojoShellConnectionImpl::OnConnect(shell::Connection* connection) {
+  std::string remote_app = connection->GetRemoteIdentity().name();
+  if (remote_app == "mojo:shell") {
+    // Only expose the SCF interface to the shell.
+    connection->AddInterface<shell::mojom::ServiceFactory>(this);
     return true;
   }
 
-  /////////////////////////////////////////////////////////////////////////////
-  // shell::InterfaceFactory<shell::mojom::ServiceFactory> implementation
-
-  void Create(shell::Connection* connection,
-              shell::mojom::ServiceFactoryRequest request) override {
-    DCHECK(io_thread_checker_.CalledOnValidThread());
-    factory_bindings_.AddBinding(this, std::move(request));
+  bool accept = false;
+  for (auto& client : embedded_services_)
+    accept |= client->OnConnect(connection);
+
+  // Reject all other connections to this application.
+  return accept;
+}
+
+shell::InterfaceRegistry*
+MojoShellConnectionImpl::GetInterfaceRegistryForConnection() {
+  // TODO(beng): This is really horrible since obviously subject to issues
+  // of ordering, but is no more horrible than this API is in general.
+  shell::InterfaceRegistry* registry = nullptr;
+  for (auto& client : embedded_services_) {
+    registry = client->GetInterfaceRegistryForConnection();
+    if (registry)
+      return registry;
   }
-
-  /////////////////////////////////////////////////////////////////////////////
-  // shell::mojom::ServiceFactory implementation
-
-  void CreateService(shell::mojom::ServiceRequest request,
-                     const mojo::String& name) override {
-    DCHECK(io_thread_checker_.CalledOnValidThread());
-    callback_task_runner_->PostTask(
-        FROM_HERE,
-        base::Bind(create_service_callback_, base::Passed(&request), name));
+  return nullptr;
+}
+
+shell::InterfaceProvider*
+MojoShellConnectionImpl::GetInterfaceProviderForConnection() {
+  // TODO(beng): This is really horrible since obviously subject to issues
+  // of ordering, but is no more horrible than this API is in general.
+  shell::InterfaceProvider* provider = nullptr;
+  for (auto& client : embedded_services_) {
+    provider = client->GetInterfaceProviderForConnection();
+    if (provider)
+      return provider;
   }
-
-  static void CallBinderOnTaskRunner(
-      scoped_refptr<base::SequencedTaskRunner> task_runner,
-      const shell::InterfaceRegistry::Binder& binder,
-      const mojo::String& interface_name,
-      mojo::ScopedMessagePipeHandle request_handle) {
-    task_runner->PostTask(FROM_HERE, base::Bind(binder, interface_name,
-                                                base::Passed(&request_handle)));
-  }
-
-  base::ThreadChecker io_thread_checker_;
-  bool started_ = false;
-
-  // Temporary state established on construction and consumed on the IO thread
-  // once the connection is started.
-  shell::mojom::ServiceRequest pending_service_request_;
-  scoped_refptr<base::SequencedTaskRunner> io_task_runner_;
-  std::unique_ptr<shell::Connector> io_thread_connector_;
-  shell::mojom::ConnectorRequest pending_connector_request_;
-
-  // TaskRunner on which to run our owner's callbacks, i.e. the ones passed to
-  // Start().
-  scoped_refptr<base::SequencedTaskRunner> callback_task_runner_;
-
-  // Callback to run once Service::OnStart is invoked.
-  InitializeCallback initialize_handler_;
-
-  // Callback to run when a new Service request is received.
-  ServiceFactoryCallback create_service_callback_;
-
-  // Callback to run if the service is stopped by the service manager.
-  base::Closure stop_callback_;
-
-  // The incoming Connection from the browser process. This is captured the
-  // first time the browser connects to this Service and persists until shutdown
-  // or a connection error is detected. This connection is used to fulfill
-  // remote interface requests from legacy code which does not use
-  // shell::Connector.
-  //
-  // TODO(rockot): Remove this once all child-to-browser interface connections
-  // are made via a Connector rather than directly through an InterfaceProvider
-  // and all interfaces exposed to the browser are exposed via a
-  // ConnectionFilter.
-  shell::Connection* browser_connection_ = nullptr;
-
-  // A queue of remote interface requests destined for the browser, which will
-  // remain pending until an incoming connection is accepted from the browser.
-  //
-  // TODO(rockot): Remove this once all child-to-browser interface connections
-  // are made via a Connector rather than directly through an InterfaceProvider.
-  std::queue<std::pair<mojo::String, mojo::ScopedMessagePipeHandle>>
-      pending_remote_interface_requests_;
-
-  // Default binder callback used for the browser connection's
-  // InterfaceRegistry.
-  //
-  // TODO(rockot): Remove this once all interfaces exposed to the browser are
-  // exposed via a ConnectionFilter.
-  shell::InterfaceRegistry::Binder default_browser_binder_;
-
-  std::unique_ptr<shell::ServiceContext> service_context_;
-  mojo::BindingSet<shell::mojom::ServiceFactory> factory_bindings_;
-  std::vector<std::unique_ptr<ConnectionFilter>> connection_filters_;
-
-  DISALLOW_COPY_AND_ASSIGN(IOThreadContext);
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// MojoShellConnection, public:
-
-// static
-void MojoShellConnection::SetForProcess(
-    std::unique_ptr<MojoShellConnection> connection) {
-  DCHECK(!g_connection_for_process.Get());
-  g_connection_for_process.Get() = std::move(connection);
-}
-
-// static
-MojoShellConnection* MojoShellConnection::GetForProcess() {
-  return g_connection_for_process.Get().get();
-}
-
-// static
-void MojoShellConnection::DestroyForProcess() {
-  // This joins the shell controller thread.
-  g_connection_for_process.Get().reset();
-}
-
-// static
-void MojoShellConnection::SetFactoryForTest(Factory* factory) {
-  DCHECK(!g_connection_for_process.Get());
-  mojo_shell_connection_factory = factory;
-}
-
-// static
-std::unique_ptr<MojoShellConnection> MojoShellConnection::Create(
+  return nullptr;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// MojoShellConnectionImpl,
+//     shell::InterfaceFactory<shell::mojom::ServiceFactory> implementation:
+
+void MojoShellConnectionImpl::Create(
+    shell::Connection* connection,
+    shell::mojom::ServiceFactoryRequest request) {
+  factory_bindings_.AddBinding(this, std::move(request));
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// MojoShellConnectionImpl, shell::mojom::ServiceFactory implementation:
+
+void MojoShellConnectionImpl::CreateService(
     shell::mojom::ServiceRequest request,
-    scoped_refptr<base::SequencedTaskRunner> io_task_runner) {
-  if (mojo_shell_connection_factory)
-    return mojo_shell_connection_factory->Run();
-  return base::MakeUnique<MojoShellConnectionImpl>(
-      std::move(request), io_task_runner);
-}
-
-MojoShellConnection::~MojoShellConnection() {}
-
-////////////////////////////////////////////////////////////////////////////////
-// MojoShellConnectionImpl, public:
-
-MojoShellConnectionImpl::MojoShellConnectionImpl(
-    shell::mojom::ServiceRequest request,
-    scoped_refptr<base::SequencedTaskRunner> io_task_runner)
-    : weak_factory_(this) {
-  shell::mojom::ConnectorRequest connector_request;
-  connector_ = shell::Connector::Create(&connector_request);
-
-  std::unique_ptr<shell::Connector> io_thread_connector = connector_->Clone();
-  context_ = new IOThreadContext(
-      std::move(request), io_task_runner, std::move(io_thread_connector),
-      std::move(connector_request));
-}
-
-MojoShellConnectionImpl::~MojoShellConnectionImpl() {
-  context_->ShutDown();
+    const mojo::String& name) {
+  auto it = request_handlers_.find(name);
+  if (it != request_handlers_.end())
+    it->second.Run(std::move(request));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // MojoShellConnectionImpl, MojoShellConnection implementation:
 
-void MojoShellConnectionImpl::Start() {
-  context_->Start(
-      base::Bind(&MojoShellConnectionImpl::OnContextInitialized,
-                 weak_factory_.GetWeakPtr()),
-      base::Bind(&MojoShellConnectionImpl::CreateService,
-                 weak_factory_.GetWeakPtr()),
-      base::Bind(&MojoShellConnectionImpl::OnConnectionLost,
-                 weak_factory_.GetWeakPtr()));
-}
-
-void MojoShellConnectionImpl::SetInitializeHandler(
-    const base::Closure& handler) {
-  DCHECK(initialize_handler_.is_null());
-  initialize_handler_ = handler;
+shell::ServiceContext* MojoShellConnectionImpl::GetShellConnection() {
+  return shell_connection_.get();
 }
 
 shell::Connector* MojoShellConnectionImpl::GetConnector() {
-  return connector_.get();
+  DCHECK(shell_connection_);
+  return shell_connection_->connector();
 }
 
 const shell::Identity& MojoShellConnectionImpl::GetIdentity() const {
-  return identity_;
+  DCHECK(shell_connection_);
+  return shell_connection_->identity();
 }
 
 void MojoShellConnectionImpl::SetConnectionLostClosure(
     const base::Closure& closure) {
-  connection_lost_handler_ = closure;
-}
-
-void MojoShellConnectionImpl::SetupInterfaceRequestProxies(
-    shell::InterfaceRegistry* registry,
-    shell::InterfaceProvider* provider) {
-  // It's safe to bind |registry| as a raw pointer because the caller must
-  // guarantee that it outlives |this|, and |this| is bound as a weak ptr here.
-  context_->SetDefaultBinderForBrowserConnection(
-      base::Bind(&MojoShellConnectionImpl::GetInterface,
-                 weak_factory_.GetWeakPtr(), registry));
-
-  // Forward all remote interface requests on |provider| to our IO-thread
-  // context. This will ensure they're forwarded to the provider on the
-  // incoming browser connection.
-  provider->Forward(base::Bind(&IOThreadContext::GetRemoteInterface, context_));
-}
-
-void MojoShellConnectionImpl::AddConnectionFilter(
-    std::unique_ptr<ConnectionFilter> filter) {
-  context_->AddConnectionFilter(std::move(filter));
+  shell_connection_->SetConnectionLostClosure(closure);
+}
+
+void MojoShellConnectionImpl::MergeService(
+    std::unique_ptr<shell::Service> service) {
+  embedded_services_.push_back(service.get());
+  owned_services_.push_back(std::move(service));
+}
+
+void MojoShellConnectionImpl::MergeService(
+    shell::Service* service) {
+  embedded_services_.push_back(service);
 }
 
 void MojoShellConnectionImpl::AddEmbeddedService(
@@ -420,31 +199,4 @@
   DCHECK(result.second);
 }
 
-void MojoShellConnectionImpl::CreateService(
-    shell::mojom::ServiceRequest request,
-    const mojo::String& name) {
-  auto it = request_handlers_.find(name);
-  if (it != request_handlers_.end())
-    it->second.Run(std::move(request));
-}
-
-void MojoShellConnectionImpl::OnContextInitialized(
-    const shell::Identity& identity) {
-  identity_ = identity;
-  if (!initialize_handler_.is_null())
-    base::ResetAndReturn(&initialize_handler_).Run();
-}
-
-void MojoShellConnectionImpl::OnConnectionLost() {
-  if (!connection_lost_handler_.is_null())
-    connection_lost_handler_.Run();
-}
-
-void MojoShellConnectionImpl::GetInterface(
-    shell::mojom::InterfaceProvider* provider,
-    const mojo::String& interface_name,
-    mojo::ScopedMessagePipeHandle request_handle) {
-  provider->GetInterface(interface_name, std::move(request_handle));
-}
-
 }  // namespace content