Remove extensions::ServiceRegistrationManager.

extensions/browser/extension_web_contents_observer.cc

Index: extensions/browser/extension_web_contents_observer.cc
diff --git a/extensions/browser/extension_web_contents_observer.cc b/extensions/browser/extension_web_contents_observer.cc
index ba13edd69c385e2a5dc46df0c00481489b7b5b85..020cc3257be491916530d1676ae9d89e1b23fd30 100644
--- a/extensions/browser/extension_web_contents_observer.cc
+++ b/extensions/browser/extension_web_contents_observer.cc
@@ -12,7 +12,7 @@
 #include "content/public/common/url_constants.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
-#include "extensions/browser/mojo/service_registration_manager.h"
+#include "extensions/browser/mojo/service_registration.h"
 #include "extensions/browser/view_type_utils.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_messages.h"
@@ -32,11 +32,6 @@ void ExtensionWebContentsObserver::RenderViewCreated(
     content::RenderViewHost* render_view_host) {
   NotifyRenderViewType(render_view_host);
 
-  // TODO(sammc): Call AddServicesToRenderFrame() for frames that aren't main
-  // frames.
-  ServiceRegistrationManager::GetSharedInstance()->AddServicesToRenderFrame(
-      render_view_host->GetMainFrame());
-
   const Extension* extension = GetExtension(render_view_host);
   if (!extension)
     return;
@@ -95,6 +90,11 @@ void ExtensionWebContentsObserver::RenderViewCreated(
   }
 }
 
+void ExtensionWebContentsObserver::RenderFrameCreated(
+    content::RenderFrameHost* render_frame_host) {
+  RegisterCoreExtensionServices(render_frame_host);
+}
+
 void ExtensionWebContentsObserver::NotifyRenderViewType(
     content::RenderViewHost* render_view_host) {
   if (render_view_host) {