Change primordial pipes to ShellClient

mojo/shell/public/cpp/connector.h

 // Copyright 2016 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_CONNECTOR_H_
 #define MOJO_SHELL_PUBLIC_CPP_CONNECTOR_H_
 
 #include "mojo/shell/public/cpp/connection.h"
 #include "mojo/shell/public/cpp/identity.h"
 #include "mojo/shell/public/interfaces/connector.mojom.h"
 #include "mojo/shell/public/interfaces/shell.mojom.h"
-#include "mojo/shell/public/interfaces/shell_client_factory.mojom.h"
+#include "mojo/shell/public/interfaces/shell_client.mojom.h"
 
 namespace mojo {
 
 // An interface that encapsulates the Mojo Shell's broker interface by which
 // connections between applications are established. Once Connect() is called,
 // this class is bound to the thread the call was made on and it cannot be
 // passed to another thread without calling Clone().
 // An instance of this class is created internally by ShellConnection for use
 // on the thread ShellConnection is instantiated on, and this interface is
 // wrapped by the Shell interface.
@@ skipping 10 matching lines @@
 
   class ConnectParams {
    public:
     explicit ConnectParams(const Identity& target);
     explicit ConnectParams(const std::string& name);
     ~ConnectParams();
 
     const Identity& target() { return target_; }
     void set_target(const Identity& target) { target_ = target; }
     void set_client_process_connection(
-        shell::mojom::ShellClientFactoryPtr shell_client_factory,
+        shell::mojom::ShellClientPtr shell_client,
         shell::mojom::PIDReceiverRequest pid_receiver_request) {
-      shell_client_factory_ = std::move(shell_client_factory);
+      shell_client_ = std::move(shell_client);
       pid_receiver_request_ = std::move(pid_receiver_request);
     }
     void TakeClientProcessConnection(
-        shell::mojom::ShellClientFactoryPtr* shell_client_factory,
+        shell::mojom::ShellClientPtr* shell_client,
         shell::mojom::PIDReceiverRequest* pid_receiver_request) {
-      *shell_client_factory = std::move(shell_client_factory_);
+      *shell_client = std::move(shell_client_);
       *pid_receiver_request = std::move(pid_receiver_request_);
     }
 
    private:
     Identity target_;
-    shell::mojom::ShellClientFactoryPtr shell_client_factory_;
+    shell::mojom::ShellClientPtr shell_client_;
     shell::mojom::PIDReceiverRequest pid_receiver_request_;
 
     DISALLOW_COPY_AND_ASSIGN(ConnectParams);
   };
 
   // Requests a new connection to an application. Returns a pointer to the
   // connection if the connection is permitted by this application's delegate,
   // or nullptr otherwise. Caller takes ownership.
   // Once this method is called, this object is bound to the thread on which the
   // call took place. To pass to another thread, call Clone() and pass the
@@ skipping 24 matching lines @@
 
   // Creates a new instance of this class which may be passed to another thread.
   // The returned object may be passed multiple times until Connect() is called,
   // at which point this method must be called again to pass again.
   virtual scoped_ptr<Connector> Clone() = 0;
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_PUBLIC_CPP_CONNECTOR_H_