De-client the ViewManager interfaces

services/view_manager/client_connection.h

Index: services/view_manager/client_connection.h
diff --git a/services/view_manager/client_connection.h b/services/view_manager/client_connection.h
index 7f5050808ba8a58dd53c20f043b7da1e4a8653c5..acbfc737c79f5946fe5f44337e30f263ed328841 100644
--- a/services/view_manager/client_connection.h
+++ b/services/view_manager/client_connection.h
@@ -19,7 +19,8 @@ class ViewManagerServiceImpl;
 // to the view manager.
 class ClientConnection {
  public:
-  explicit ClientConnection(scoped_ptr<ViewManagerServiceImpl> service);
+  ClientConnection(scoped_ptr<ViewManagerServiceImpl> service,
+                   mojo::ViewManagerClient* client);
   virtual ~ClientConnection();
 
   ViewManagerServiceImpl* service() { return service_.get(); }
@@ -27,9 +28,6 @@ class ClientConnection {
 
   mojo::ViewManagerClient* client() { return client_; }
 
- protected:
-  void set_client(mojo::ViewManagerClient* client) { client_ = client; }
-
  private:
   scoped_ptr<ViewManagerServiceImpl> service_;
   mojo::ViewManagerClient* client_;
@@ -41,9 +39,11 @@ class ClientConnection {
 class DefaultClientConnection : public ClientConnection,
                                 public mojo::ErrorHandler {
  public:
-  DefaultClientConnection(scoped_ptr<ViewManagerServiceImpl> service_impl,
-                          ConnectionManager* connection_manager,
-                          mojo::ScopedMessagePipeHandle handle);
+  DefaultClientConnection(
+      scoped_ptr<ViewManagerServiceImpl> service_impl,
+      ConnectionManager* connection_manager,
+      mojo::InterfaceRequest<mojo::ViewManagerService> service_request,
+      mojo::ViewManagerClientPtr client);
   ~DefaultClientConnection() override;
 
  private:
@@ -52,6 +52,7 @@ class DefaultClientConnection : public ClientConnection,
 
   ConnectionManager* connection_manager_;
   mojo::Binding<mojo::ViewManagerService> binding_;
+  mojo::ViewManagerClientPtr client_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultClientConnection);
 };