Begin to wean child processes off reliance on a persistent service_manager::Connection to the brows…

content/child/child_thread_impl.h

 // Copyright (c) 2012 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_CHILD_CHILD_THREAD_IMPL_H_
 #define CONTENT_CHILD_CHILD_THREAD_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 79 matching lines @@
 
   // ChildThread implementation:
 #if defined(OS_WIN)
   void PreCacheFont(const LOGFONT& log_font) override;
   void ReleaseCachedFonts() override;
 #endif
   void RecordAction(const base::UserMetricsAction& action) override;
   void RecordComputedAction(const std::string& action) override;
   ServiceManagerConnection* GetServiceManagerConnection() override;
   service_manager::InterfaceRegistry* GetInterfaceRegistry() override;
-  service_manager::InterfaceProvider* GetRemoteInterfaces() override;
+  service_manager::Connector* GetConnector() override;
 
   // Returns the service_manager::ServiceInfo for the child process & the
   // browser process, once available.
   const service_manager::ServiceInfo& GetChildServiceInfo() const;
   const service_manager::ServiceInfo& GetBrowserServiceInfo() const;
   bool IsConnectedToBrowser() const;
 
   IPC::SyncChannel* channel() { return channel_.get(); }
 
   IPC::MessageRouter* GetRouter();
@@ skipping 133 matching lines @@
       const std::string& name,
       mojom::AssociatedInterfaceAssociatedRequest request) override;
 
   // Called when a connection is received from another service. When that other
   // service is the browser process, stores the remote's info.
   void OnServiceConnect(const service_manager::ServiceInfo& local_info,
                         const service_manager::ServiceInfo& remote_info);
 
   std::unique_ptr<mojo::edk::ScopedIPCSupport> mojo_ipc_support_;
   std::unique_ptr<service_manager::InterfaceRegistry> interface_registry_;
-  std::unique_ptr<service_manager::InterfaceProvider> remote_interfaces_;
   std::unique_ptr<ServiceManagerConnection> service_manager_connection_;
   std::unique_ptr<service_manager::Connection> browser_connection_;
 
   bool connected_to_browser_ = false;
   service_manager::ServiceInfo child_info_;
   service_manager::ServiceInfo browser_info_;
 
   mojo::AssociatedBinding<mojom::RouteProvider> route_provider_binding_;
   mojo::AssociatedBindingSet<mojom::AssociatedInterfaceProvider, int32_t>
       associated_interface_provider_bindings_;
@@ skipping 74 matching lines @@
 
  private:
   struct Options options_;
 
   DISALLOW_COPY_AND_ASSIGN(Builder);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_CHILD_THREAD_IMPL_H_