Add frame-specific InterfaceProviderSpec.

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 88 matching lines @@
 #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;
 
+  // Returns the service_manager::ServiceInfo for the child process & the
+  // browser process, once available.
+  const service_manager::ServiceInfo& GetChildServiceInfo() const;

[Ken Rockot(use gerrit already), 2016/10/27 05:12:52]

nit: Could you also expose a bool IsConnectedToBrowser() or something, and
document specifically that these are available when that's true? Then RFI could
DCHECK it to clarify before accessing these, maybe with some clarification that
the code is unreachable until the browser is connected.

+  const service_manager::ServiceInfo& GetBrowserServiceInfo() const;
+
   IPC::SyncChannel* channel() { return channel_.get(); }
 
   IPC::MessageRouter* GetRouter();
 
   mojom::RouteProvider* GetRemoteRouteProvider();
 
   // Allocates a block of shared memory of the given size. Returns NULL on
   // failure.
   // Note: On posix, this requires a sync IPC to the browser process,
   // but on windows the child process directly allocates the block.
@@ skipping 140 matching lines @@
   // mojom::RouteProvider:
   void GetRoute(
       int32_t routing_id,
       mojom::AssociatedInterfaceProviderAssociatedRequest request) override;
 
   // mojom::AssociatedInterfaceProvider:
   void GetAssociatedInterface(
       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 OnConnect(const service_manager::ServiceInfo& local_info,

[Ken Rockot(use gerrit already), 2016/10/27 05:12:52]

Maybe a more descriptive name like OnServiceConnection since it's less clear
what "OnConnect" means in the context of a ChildThreadImpl

+                 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_;
 
+  service_manager::ServiceInfo child_info_;
+  service_manager::ServiceInfo browser_info_;
+
   mojo::AssociatedBinding<mojom::RouteProvider> route_provider_binding_;
   mojo::AssociatedBindingSet<mojom::AssociatedInterfaceProvider>
       associated_interface_provider_bindings_;
   mojom::RouteProviderAssociatedPtr remote_route_provider_;
 
   std::unique_ptr<IPC::SyncChannel> channel_;
 
   // Allows threads other than the main thread to send sync messages.
   scoped_refptr<IPC::SyncMessageFilter> sync_message_filter_;
 
@@ skipping 74 matching lines @@
 
  private:
   struct Options options_;
 
   DISALLOW_COPY_AND_ASSIGN(Builder);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_CHILD_THREAD_IMPL_H_