Move content's shell connections to the IO thread

services/shell/public/cpp/lib/shell_connection.cc

 // Copyright 2014 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 "services/shell/public/cpp/shell_connection.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "services/shell/public/cpp/capabilities.h"
-#include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/cpp/lib/connection_impl.h"
 #include "services/shell/public/cpp/lib/connector_impl.h"
 #include "services/shell/public/cpp/shell_client.h"
 
 namespace shell {
 
 ////////////////////////////////////////////////////////////////////////////////
 // ShellConnection, public:
 
 ShellConnection::ShellConnection(shell::ShellClient* client,
-                                 mojom::ShellClientRequest request)
-    : client_(client), binding_(this) {
-  mojom::ConnectorPtr connector;
-  pending_connector_request_ = GetProxy(&connector);
-  connector_.reset(new ConnectorImpl(std::move(connector)));
+                                 mojom::ShellClientRequest request,
+                                 std::unique_ptr<Connector> connector,
+                                 mojom::ConnectorRequest connector_request)
+    : pending_connector_request_(std::move(connector_request)),
+      client_(client), binding_(this), connector_(std::move(connector)) {
+  if (!connector_) {
+    connector_ = Connector::Create(&pending_connector_request_);
+  } else {
+    DCHECK(pending_connector_request_.is_pending());
+  }
 
   DCHECK(request.is_pending());
   binding_.Bind(std::move(request));
 }
 
 ShellConnection::~ShellConnection() {}
 
 void ShellConnection::set_initialize_handler(const base::Closure& callback) {
   initialize_handler_ = callback;
 }
@@ skipping 81 matching lines @@
   // invalid.
   should_run_connection_lost_closure_ = client_->ShellConnectionLost();
   if (should_run_connection_lost_closure_ &&
       !connection_lost_closure_.is_null())
     connection_lost_closure_.Run();
   // We don't reset the connector as clients may have taken a raw pointer to it.
   // Connect() will return nullptr if they try to connect to anything.
 }
 
 }  // namespace shell