Adds routed interface support between RenderFrameHost and RenderFrame

content/public/browser/render_frame_host.h

Index: content/public/browser/render_frame_host.h
diff --git a/content/public/browser/render_frame_host.h b/content/public/browser/render_frame_host.h
index a3a88636f2c87e8dda41c233d5f9090288b23c4d..590ca6c8ace78013ef28a0a3a2573fd6955d7576 100644
--- a/content/public/browser/render_frame_host.h
+++ b/content/public/browser/render_frame_host.h
@@ -10,10 +10,13 @@
 #include "base/callback_forward.h"
 #include "build/build_config.h"
 #include "content/common/content_export.h"
+#include "content/public/browser/render_process_host.h"
 #include "content/public/common/console_message_level.h"
 #include "content/public/common/file_chooser_params.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
+#include "mojo/public/cpp/bindings/associated_interface_ptr.h"

[Sam McNally, 2016/09/09 05:33:14]

I don't think these extra includes are needed anymore.

[Ken Rockot(use gerrit already), 2016/09/09 16:01:50]

Removed

+#include "mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h"
 #include "third_party/WebKit/public/platform/WebPageVisibilityState.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/native_widget_types.h"
@@ -30,7 +33,8 @@ class InterfaceProvider;
 }
 
 namespace content {
-class RenderProcessHost;
+class AssociatedInterfaceProvider;
+class AssociatedInterfaceRegistry;
 class RenderViewHost;
 class RenderWidgetHostView;
 class SiteInstance;
@@ -191,6 +195,14 @@ class CONTENT_EXPORT RenderFrameHost : public IPC::Listener,
   // interfaces exposed to it by the application running in this frame.
   virtual shell::InterfaceProvider* GetRemoteInterfaces() = 0;
 
+  // Returns the AssociatedInterfaceRegistry for this frame. This can be used
+  // to add frame-specific Channel-associated interfaces to this frame.
+  virtual AssociatedInterfaceRegistry* GetAssociatedInterfaceRegistry() = 0;
+
+  // Returns the AssociatedInterfaceProvider that this process can use to access
+  // remote frame-specific Channel-associated interfaces for this frame.
+  virtual AssociatedInterfaceProvider* GetRemoteAssociatedInterfaces() = 0;
+
   // Returns the visibility state of the frame. The different visibility states
   // of a frame are defined in Blink.
   virtual blink::WebPageVisibilityState GetVisibilityState() = 0;