Change primordial pipes to ShellClient

mojo/shell/public/cpp/lib/connector_impl.cc

Index: mojo/shell/public/cpp/lib/connector_impl.cc
diff --git a/mojo/shell/public/cpp/lib/connector_impl.cc b/mojo/shell/public/cpp/lib/connector_impl.cc
index 7ff56d4d77ed31dabf9bf80a21022fe43028dbce..3b16a0cd6216f80e6b6951459b86c26e8af5ce85 100644
--- a/mojo/shell/public/cpp/lib/connector_impl.cc
+++ b/mojo/shell/public/cpp/lib/connector_impl.cc
@@ -59,21 +59,19 @@ scoped_ptr<Connection> ConnectorImpl::Connect(ConnectParams* params) {
       shell::mojom::kInvalidInstanceID, std::move(remote_interfaces),
       std::move(local_request), request, Connection::State::PENDING));
 
-  shell::mojom::ShellClientFactoryPtr shell_client_factory;
+  shell::mojom::ShellClientPtr shell_client;
   shell::mojom::PIDReceiverRequest pid_receiver_request;
-  params->TakeClientProcessConnection(&shell_client_factory,
-                                      &pid_receiver_request);
+  params->TakeClientProcessConnection(&shell_client, &pid_receiver_request);
   shell::mojom::ClientProcessConnectionPtr client_process_connection;
-  if (shell_client_factory.is_bound() && pid_receiver_request.is_pending()) {
+  if (shell_client.is_bound() && pid_receiver_request.is_pending()) {
     client_process_connection = shell::mojom::ClientProcessConnection::New();
-    client_process_connection->shell_client_factory =
-        shell_client_factory.PassInterface().PassHandle();
+    client_process_connection->shell_client =
+        shell_client.PassInterface().PassHandle();
     client_process_connection->pid_receiver_request =
         pid_receiver_request.PassMessagePipe();
-  } else if (shell_client_factory.is_bound() ||
-             pid_receiver_request.is_pending()) {
-    NOTREACHED() << "If one of shell_client_factory or pid_receiver_request is"
-                 << "valid, both must be valid.";
+  } else if (shell_client.is_bound() || pid_receiver_request.is_pending()) {
+    NOTREACHED() << "If one of shell_client or pid_receiver_request is valid, "
+                 << "both must be valid.";
     return std::move(registry);
   }
   connector_->Connect(