Decouple RulesCacheDelegate from RulesRegistry

chrome/browser/extensions/api/declarative_content/content_rules_registry.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_CONTENT_CONTENT_RULES_REGISTRY_H_
 #define CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_CONTENT_CONTENT_RULES_REGISTRY_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 46 matching lines @@
 // ContentRuleActions.
 //
 // The evaluation of URL related condition attributes (host_suffix, path_prefix)
 // is delegated to a URLMatcher, because this is capable of evaluating many
 // of such URL related condition attributes in parallel.
 class ContentRulesRegistry : public RulesRegistry,
                              public content::NotificationObserver {
  public:
   // For testing, |ui_part| can be NULL. In that case it constructs the
   // registry with storage functionality suspended.
-  ContentRulesRegistry(Profile* profile,
-                       scoped_ptr<RulesCacheDelegate>* ui_part);
+  ContentRulesRegistry(Profile* profile, RulesCacheDelegate* cache_delegate);
 
   // Applies all content rules given an update (CSS match change or
   // page navigation, for now) from the renderer.
   void Apply(content::WebContents* contents,
              const std::vector<std::string>& matching_css_selectors);
 
   // Applies all content rules given that a tab was just navigated.
   void DidNavigateMainFrame(content::WebContents* tab,
                             const content::LoadCommittedDetails& details,
                             const content::FrameNavigateParams& params);
@@ skipping 35 matching lines @@
   void UpdateConditionCache();
 
   // Tells a renderer what page attributes to watch for using an
   // ExtensionMsg_WatchPages.
   void InstructRenderProcess(content::RenderProcessHost* process);
 
   typedef std::map<URLMatcherConditionSet::ID, ContentRule*> URLMatcherIdToRule;
   typedef std::map<ContentRule::GlobalRuleId, linked_ptr<ContentRule> >
       RulesMap;
 
-  Profile* const profile_;
-
   // Map that tells us which ContentRules may match under the condition that
   // the URLMatcherConditionSet::ID was returned by the |url_matcher_|.
   URLMatcherIdToRule match_id_to_rule_;
 
   RulesMap content_rules_;
 
   // Maps tab_id to the set of rules that match on that tab.  This
   // lets us call Revert as appropriate.
   std::map<int, std::set<ContentRule*> > active_rules_;
 
   // Matches URLs for the page_url condition.
   URLMatcher url_matcher_;
 
   // All CSS selectors any rule's conditions watch for.
   std::vector<std::string> watched_css_selectors_;
 
   // Manages our notification registrations.
   content::NotificationRegistrar registrar_;
 
   scoped_refptr<ExtensionInfoMap> extension_info_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentRulesRegistry);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_CONTENT_CONTENT_RULES_REGISTRY_H_