Change primordial pipes to ShellClient

mojo/shell/public/cpp/connector.h

Index: mojo/shell/public/cpp/connector.h
diff --git a/mojo/shell/public/cpp/connector.h b/mojo/shell/public/cpp/connector.h
index 73a6ef48a99a703537fd100b52e8d92432b1e512..b6155350f052da89af3abc3b9e70db32eae32a50 100644
--- a/mojo/shell/public/cpp/connector.h
+++ b/mojo/shell/public/cpp/connector.h
@@ -9,7 +9,7 @@
 #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 {
 
@@ -40,21 +40,21 @@ class Connector {
     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);