Separate Remote InterfaceProvider again, and add a new client lib type for it.

services/shell/public/cpp/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 SERVICES_SHELL_PUBLIC_CPP_CONNECTION_H_
 #define SERVICES_SHELL_PUBLIC_CPP_CONNECTION_H_
 
 #include <stdint.h>
 
 #include <string>
 #include <utility>
 
 #include "base/memory/weak_ptr.h"
 #include "services/shell/public/cpp/connect.h"
 #include "services/shell/public/cpp/identity.h"
 #include "services/shell/public/cpp/interface_registry.h"
+#include "services/shell/public/cpp/remote_interface_registry.h"
 #include "services/shell/public/interfaces/connector.mojom.h"
 #include "services/shell/public/interfaces/interface_provider.mojom.h"
 
 namespace shell {
 
 class InterfaceBinder;
+class RemoteInterfaceRegistry;
 
 // Represents a connection to another application. An instance of this class is
 // returned from Shell's ConnectToApplication(), and passed to ShellClient's
 // AcceptConnection() each time an incoming connection is received.
 //
 // Call AddService<T>(factory) to expose an interface to the remote application,
 // and GetInterface(&interface_ptr) to consume an interface exposed by the
 // remote application.
 //
 // Internally, this class wraps an InterfaceRegistry that accepts interfaces
@@ skipping 46 matching lines @@
       const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) {
     return GetInterfaceRegistry()->AddInterface<Interface>(
         callback, task_runner);
   }
 
   // Binds |ptr| to an implementation of Interface in the remote application.
   // |ptr| can immediately be used to start sending requests to the remote
   // interface.
   template <typename Interface>
   void GetInterface(mojo::InterfacePtr<Interface>* ptr) {
-    GetInterfaceRegistry()->GetInterface(ptr);
+    GetRemoteInterfaceRegistry()->GetInterface(ptr);
   }
 
   // Returns true if the remote application has the specified capability class
   // specified in its manifest. Only valid for inbound connections. Will return
   // false for outbound connections.
   virtual bool HasCapabilityClass(const std::string& class_name) const = 0;
 
   // Returns the name that was used by the source application to establish a
   // connection to the destination application.
   //
@@ skipping 31 matching lines @@
   // Register a closure to be run when the connection has been completed by the
   // shell and remote metadata is available. Useful only for connections created
   // via Connector::Connect(). Once the connection is complete, metadata is
   // available immediately.
   virtual void AddConnectionCompletedClosure(const mojo::Closure& callback) = 0;
 
   // Returns true if the Shell allows |interface_name| to be exposed to the
   // remote application.
   virtual bool AllowsInterface(const std::string& interface_name) const = 0;
 
-  // Returns the InterfaceRegistry that encapsulates the pair of
-  // InterfaceProviders between this application and the remote.
+  // Returns a raw pointer to the InterfaceProvider at the remote end.
+  virtual mojom::InterfaceProvider* GetRemoteInterfaceProvider() = 0;
+
+ protected:
+  // Returns the InterfaceRegistry that implements the mojom::InterfaceProvider
+  // exposed to the remote application.
   virtual InterfaceRegistry* GetInterfaceRegistry() = 0;
 
- protected:
+  // Returns an object encapsulating a remote InterfaceProvider.
+  virtual RemoteInterfaceRegistry* GetRemoteInterfaceRegistry() = 0;
+
   virtual base::WeakPtr<Connection> GetWeakPtr() = 0;
 };
 
 }  // namespace shell
 
 #endif  // SERVICES_SHELL_PUBLIC_CPP_CONNECTION_H_