Remove extensions::ServiceRegistrationManager.

extensions/browser/extension_web_contents_observer.cc

 // Copyright 2014 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.
 
 #include "extensions/browser/extension_web_contents_observer.h"
 
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #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"
 
 namespace extensions {
 
 ExtensionWebContentsObserver::ExtensionWebContentsObserver(
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       browser_context_(web_contents->GetBrowserContext()) {
   NotifyRenderViewType(web_contents->GetRenderViewHost());
 }
 
 ExtensionWebContentsObserver::~ExtensionWebContentsObserver() {}
 
 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;
 
   content::RenderProcessHost* process = render_view_host->GetProcess();
 
   // Some extensions use chrome:// URLs.
   // This is a temporary solution. Replace it with access to chrome-static://
   // once it is implemented. See: crbug.com/226927.
   Manifest::Type type = extension->GetType();
@@ skipping 38 matching lines @@
     case Manifest::TYPE_UNKNOWN:
     case Manifest::TYPE_THEME:
     case Manifest::TYPE_SHARED_MODULE:
       break;
 
     case Manifest::NUM_LOAD_TYPES:
       NOTREACHED();
   }
 }
 
+void ExtensionWebContentsObserver::RenderFrameCreated(
+    content::RenderFrameHost* render_frame_host) {
+  RegisterCoreExtensionServices(render_frame_host);
+}
+
 void ExtensionWebContentsObserver::NotifyRenderViewType(
     content::RenderViewHost* render_view_host) {
   if (render_view_host) {
     render_view_host->Send(new ExtensionMsg_NotifyRenderViewType(
         render_view_host->GetRoutingID(), GetViewType(web_contents())));
   }
 }
 
 const Extension* ExtensionWebContentsObserver::GetExtension(
     content::RenderViewHost* render_view_host) {
@@ skipping 15 matching lines @@
   // site, so we can ignore that wrinkle here.
   const GURL& site = render_view_host->GetSiteInstance()->GetSiteURL();
 
   if (!site.SchemeIs(kExtensionScheme))
     return std::string();
 
   return site.host();
 }
 
 }  // namespace extensions