Refactor RulesRegistryWithCache to 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>
 #include <vector>
 
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "chrome/browser/extensions/api/declarative/declarative_rule.h"
-#include "chrome/browser/extensions/api/declarative/rules_registry_with_cache.h"
+#include "chrome/browser/extensions/api/declarative/rules_registry.h"
 #include "chrome/browser/extensions/api/declarative_content/content_action.h"
 #include "chrome/browser/extensions/api/declarative_content/content_condition.h"
 #include "chrome/browser/extensions/extension_info_map.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "extensions/common/matcher/url_matcher.h"
 
 class Profile;
 class ContentPermissions;
 
@@ skipping 23 matching lines @@
 //
 // Here is the high level overview of this functionality:
 //
 // RulesRegistry::Rule consists of Conditions and Actions, these are
 // represented as a ContentRule with ContentConditions and
 // 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 RulesRegistryWithCache,
+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<RulesRegistryWithCache::RuleStorageOnUI>* ui_part);
+  ContentRulesRegistry(Profile* profile,
+                       scoped_ptr<RulesCacheDelegate>* ui_part);
 
   // 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);
 
-  // Implementation of RulesRegistryWithCache:
+  // Implementation of RulesRegistry:
   virtual std::string AddRulesImpl(
       const std::string& extension_id,
       const std::vector<linked_ptr<RulesRegistry::Rule> >& rules) OVERRIDE;
   virtual std::string RemoveRulesImpl(
       const std::string& extension_id,
       const std::vector<std::string>& rule_identifiers) OVERRIDE;
   virtual std::string RemoveAllRulesImpl(
       const std::string& extension_id) OVERRIDE;
 
   // content::NotificationObserver implementation.
@@ skipping 52 matching lines @@
   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_