Revert "Revert 202751 "Change RulesRegistryService to use ProfileKeyedAPI.""

chrome/browser/extensions/tab_helper.cc

 // 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.
 
 #include "chrome/browser/extensions/tab_helper.h"
 
 #include "chrome/browser/extensions/activity_log/activity_log.h"
 #include "chrome/browser/extensions/api/declarative/rules_registry_service.h"
 #include "chrome/browser/extensions/api/declarative_content/content_rules_registry.h"
 #include "chrome/browser/extensions/crx_installer.h"
@@ skipping 67 matching lines @@
 }
 
 TabHelper::TabHelper(content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       extension_app_(NULL),
       extension_function_dispatcher_(
           Profile::FromBrowserContext(web_contents->GetBrowserContext()), this),
       pending_web_app_action_(NONE),
       script_executor_(new ScriptExecutor(web_contents,
                                           &script_execution_observers_)),
-      rules_registry_service_(
-          ExtensionSystem::Get(
-              Profile::FromBrowserContext(web_contents->GetBrowserContext()))->
-          rules_registry_service()),
       image_loader_ptr_factory_(this) {
   // The ActiveTabPermissionManager requires a session ID; ensure this
   // WebContents has one.
   SessionTabHelper::CreateForWebContents(web_contents);
   if (web_contents->GetRenderViewHost())
     SetTabId(web_contents->GetRenderViewHost());
   active_tab_permission_granter_.reset(new ActiveTabPermissionGranter(
       web_contents,
       SessionID::IdForTab(web_contents),
       Profile::FromBrowserContext(web_contents->GetBrowserContext())));
@@ skipping 85 matching lines @@
 }
 
 void TabHelper::RenderViewCreated(RenderViewHost* render_view_host) {
   SetTabId(render_view_host);
 }
 
 void TabHelper::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
 #if defined(ENABLE_EXTENSIONS)
-  if (rules_registry_service_) {
-    rules_registry_service_->content_rules_registry()->DidNavigateMainFrame(
-        web_contents(), details, params);
+  if (ExtensionSystem::Get(profile_)->extension_service()) {
+    RulesRegistryService::Get(profile_)->content_rules_registry()->
+        DidNavigateMainFrame(web_contents(), details, params);
   }
 #endif  // defined(ENABLE_EXTENSIONS)
 
   if (details.is_in_page)
     return;
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   ExtensionService* service = profile->GetExtensionService();
   if (!service)
@@ skipping 128 matching lines @@
   FOR_EACH_OBSERVER(ScriptExecutionObserver, script_execution_observers_,
                     OnScriptsExecuted(web_contents(),
                                       executing_scripts_map,
                                       on_page_id,
                                       on_url));
 }
 
 void TabHelper::OnWatchedPageChange(
     const std::vector<std::string>& css_selectors) {
 #if defined(ENABLE_EXTENSIONS)
-  if (rules_registry_service_) {
-    rules_registry_service_->content_rules_registry()->Apply(
+  if (ExtensionSystem::Get(profile_)->extension_service()) {
+    RulesRegistryService::Get(profile_)->content_rules_registry()->Apply(
         web_contents(), css_selectors);
   }
 #endif  // defined(ENABLE_EXTENSIONS)
 }
 
 const Extension* TabHelper::GetExtension(const std::string& extension_app_id) {
   if (extension_app_id.empty())
     return NULL;
 
   Profile* profile =
@@ skipping 100 matching lines @@
   }
 }
 
 void TabHelper::SetTabId(RenderViewHost* render_view_host) {
   render_view_host->Send(
       new ExtensionMsg_SetTabId(render_view_host->GetRoutingID(),
                                 SessionID::IdForTab(web_contents())));
 }
 
 }  // namespace extensions