Revert 202751 "Change RulesRegistryService to use ProfileKeyedAPI."

trunk/src/chrome/browser/extensions/tab_helper.cc

Index: trunk/src/chrome/browser/extensions/tab_helper.cc
===================================================================
--- trunk/src/chrome/browser/extensions/tab_helper.cc	(revision 202762)
+++ trunk/src/chrome/browser/extensions/tab_helper.cc	(working copy)
@@ -85,6 +85,10 @@
       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.
@@ -190,9 +194,9 @@
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
 #if defined(ENABLE_EXTENSIONS)
-  if (ExtensionSystem::Get(profile_)->extension_service()) {
-    RulesRegistryService::Get(profile_)->content_rules_registry()->
-        DidNavigateMainFrame(web_contents(), details, params);
+  if (rules_registry_service_) {
+    rules_registry_service_->content_rules_registry()->DidNavigateMainFrame(
+        web_contents(), details, params);
   }
 #endif  // defined(ENABLE_EXTENSIONS)
 
@@ -341,8 +345,8 @@
 void TabHelper::OnWatchedPageChange(
     const std::vector<std::string>& css_selectors) {
 #if defined(ENABLE_EXTENSIONS)
-  if (ExtensionSystem::Get(profile_)->extension_service()) {
-    RulesRegistryService::Get(profile_)->content_rules_registry()->Apply(
+  if (rules_registry_service_) {
+    rules_registry_service_->content_rules_registry()->Apply(
         web_contents(), css_selectors);
   }
 #endif  // defined(ENABLE_EXTENSIONS)
Property changes on: trunk/src/chrome/browser/extensions/tab_helper.cc
___________________________________________________________________
Deleted: svn:mergeinfo