Change RenderFrame to use InterfaceRegistry et al.

content/public/test/mock_render_thread.h

Index: content/public/test/mock_render_thread.h
diff --git a/content/public/test/mock_render_thread.h b/content/public/test/mock_render_thread.h
index eab95873008eebe7ef898ad88e9c5626be256a1a..b455998b3394dc887c16195a06a2cad0faf8c74a 100644
--- a/content/public/test/mock_render_thread.h
+++ b/content/public/test/mock_render_thread.h
@@ -16,6 +16,7 @@
 #include "content/public/renderer/render_thread.h"
 #include "ipc/ipc_test_sink.h"
 #include "ipc/message_filter.h"
+#include "services/shell/public/interfaces/interface_provider.mojom.h"
 #include "third_party/WebKit/public/web/WebPopupType.h"
 
 struct FrameHostMsg_CreateChildFrame_Params;
@@ -82,7 +83,8 @@ class MockRenderThread : public RenderThread {
   void PreCacheFont(const LOGFONT& log_font) override;
   void ReleaseCachedFonts() override;
 #endif
-  ServiceRegistry* GetServiceRegistry() override;
+  shell::InterfaceRegistry* GetInterfaceRegistry() override;
+  shell::InterfaceProvider* GetRemoteInterfaces() override;
 
   //////////////////////////////////////////////////////////////////////////
   // The following functions are called by the test itself.
@@ -158,7 +160,10 @@ class MockRenderThread : public RenderThread {
   base::ObserverList<RenderThreadObserver> observers_;
 
   cc::TestSharedBitmapManager shared_bitmap_manager_;
-  std::unique_ptr<ServiceRegistry> service_registry_;
+  std::unique_ptr<shell::InterfaceRegistry> interface_registry_;
+  std::unique_ptr<shell::InterfaceProvider> remote_interfaces_;
+  shell::mojom::InterfaceProviderRequest
+      pending_remote_interface_provider_request_;
 };
 
 }  // namespace content