Revert of Eliminate ChildThread InterfaceRegistry.

content/public/common/service_manager_connection.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 CONTENT_PUBLIC_COMMON_SERVICE_MANAGER_CONNECTION_H_
 #define CONTENT_PUBLIC_COMMON_SERVICE_MANAGER_CONNECTION_H_
 
 #include <memory>
 
 #include "base/callback_forward.h"
 #include "base/sequenced_task_runner.h"
 #include "content/common/content_export.h"
 #include "content/public/common/service_info.h"
 #include "services/service_manager/public/cpp/identity.h"
 #include "services/service_manager/public/interfaces/service.mojom.h"
 
 namespace service_manager {
+class Connection;
 class Connector;
+class InterfaceProvider;
+class InterfaceRegistry;
 }
 
 namespace content {
 
 class ConnectionFilter;
 
 // Encapsulates a connection to a //services/service_manager.
 // Access a global instance on the thread the ServiceContext was bound by
 // calling Holder::Get().
 // Clients can add service_manager::Service implementations whose exposed
@@ skipping 53 matching lines @@
   // Returns the service_manager::ServiceInfo for the current service and the
   // browser service (if this is not the browser service).
   virtual const service_manager::ServiceInfo& GetLocalInfo() const = 0;
   virtual const service_manager::ServiceInfo& GetBrowserInfo() const = 0;
 
   // Sets a closure that is called when the connection is lost. Note that
   // connection may already have been closed, in which case |closure| will be
   // run immediately before returning from this function.
   virtual void SetConnectionLostClosure(const base::Closure& closure) = 0;
 
+  // Provides an InterfaceRegistry to forward incoming interface requests to
+  // on the ServiceManagerConnection's own thread if they aren't bound by the
+  // connection's internal InterfaceRegistry on the IO thread.
+  //
+  // Also configures |interface_provider| to forward all of its outgoing
+  // interface requests to the connection's internal remote interface provider.
+  //
+  // Note that neither |interface_registry| or |interface_provider| is owned
+  // and both MUST outlive the ServiceManagerConnection.
+  //
+  // TODO(rockot): Remove this. It's a temporary solution to avoid porting all
+  // relevant code to ConnectionFilters at once.
+  virtual void SetupInterfaceRequestProxies(
+      service_manager::InterfaceRegistry* registry,
+      service_manager::InterfaceProvider* provider) = 0;
+
   static const int kInvalidConnectionFilterId = 0;
 
   // Allows the caller to filter inbound connections and/or expose interfaces
   // on them. |filter| may be created on any thread, but will be used and
   // destroyed exclusively on the IO thread (the thread corresponding to
   // |io_task_runner| passed to Create() above.)
   //
   // Connection filters MUST be added before calling Start() in order to avoid
   // races.
   //
@@ skipping 25 matching lines @@
   // Registers a callback to be run when the service_manager::Service
   // implementation on the IO thread receives OnConnect(). Returns an id that
   // can be passed to RemoveOnConnectHandler(), starting at 1.
   virtual int AddOnConnectHandler(const OnConnectHandler& handler) = 0;
   virtual void RemoveOnConnectHandler(int id) = 0;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_SERVICE_MANAGER_CONNECTION_H_