Extract a Connector interface from Shell that can be cloned & passed to other threads

mojo/shell/public/cpp/shell_connection.h

 // 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.
 
 #ifndef MOJO_SHELL_PUBLIC_CPP_SHELL_CONNECTION_H_
 #define MOJO_SHELL_PUBLIC_CPP_SHELL_CONNECTION_H_
 
 #include <utility>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/shell/public/cpp/shell.h"
 #include "mojo/shell/public/cpp/shell_client.h"
 #include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "mojo/shell/public/interfaces/shell_client.mojom.h"
 
 namespace mojo {
 
 class AppRefCountImpl;
+class Connector;
 
 // Encapsulates a connection to the Mojo Shell in two parts:
 // - a bound InterfacePtr to mojo::shell::mojom::Shell, the primary mechanism
 //   by which the instantiating application interacts with other services
 //   brokered by the Mojo Shell.
 // - a bound InterfaceRequest of mojo::shell::mojom::ShellClient, an interface
 //   used by the Mojo Shell to inform this application of lifecycle events and
 //   inbound connections brokered by it.
 //
 // This class should be used in two scenarios:
@@ skipping 42 matching lines @@
 
   // Block the calling thread until the Initialize() method is called by the
   // shell.
   void WaitForInitialize();
 
  private:
   friend AppRefCountImpl;
 
   // Shell:
   scoped_ptr<Connection> Connect(const std::string& url) override;
-  scoped_ptr<Connection> Connect(ConnectParams* params) override;
+  scoped_ptr<Connection> Connect(Connector::ConnectParams* params) override;
+  scoped_ptr<Connector> CloneConnector() const override;
   void Quit() override;
   scoped_ptr<AppRefCount> CreateAppRefCount() override;
 
   // shell::mojom::ShellClient:
   void Initialize(shell::mojom::ShellPtr shell,
                   const mojo::String& url,
                   uint32_t id,
                   uint32_t user_id) override;
   void AcceptConnection(
       const String& requestor_url,
@@ skipping 20 matching lines @@
   // Called from AppRefCountImpl.
   void AddRef();
   void Release();
 
   // We track the lifetime of incoming connection registries as it more
   // convenient for the client.
   ScopedVector<Connection> incoming_connections_;
   mojo::ShellClient* client_;
   Binding<shell::mojom::ShellClient> binding_;
   shell::mojom::ShellPtr shell_;
+  scoped_ptr<Connector> connector_;
   Closure termination_closure_;
   bool quit_requested_;
   int ref_count_;
   base::WeakPtrFactory<ShellConnection> weak_factory_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ShellConnection);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_PUBLIC_CPP_SHELL_CONNECTION_H_