Refactor RulesRegistryWithCache to RulesRegistry

chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.h

Index: chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.h
diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.h b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.h
index f6284257476bb256d048d218f80f5e26e4104652..311fe19ae66b2125c1c7a4ebeee16985d9dc6fbc 100644
--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.h
+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.h
@@ -17,7 +17,7 @@
 #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_webrequest/request_stage.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_action.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.h"
@@ -71,13 +71,12 @@ typedef DeclarativeRule<WebRequestCondition, WebRequestAction> WebRequestRule;
 // will respond with the URLMatcherConditionSet::ID. We can map this
 // to the WebRequestRule and check whether also the other conditions (in this
 // example 'scheme': 'http') are fulfilled.
-class WebRequestRulesRegistry : public RulesRegistryWithCache {
+class WebRequestRulesRegistry : public RulesRegistry {
  public:
-  // For testing, |ui_part| can be NULL. In that case it constructs the
-  // registry with storage functionality suspended.
-  WebRequestRulesRegistry(
-      Profile* profile,
-      scoped_ptr<RulesRegistryWithCache::RuleStorageOnUI>* ui_part);
+  // |cache_delegate| can be NULL. In that case it constructs the registry with
+  // storage functionality suspended.
+  WebRequestRulesRegistry(Profile* profile,
+                          scoped_ptr<RulesCacheDelegate>* cache_delegate);
 
   // TODO(battre): This will become an implementation detail, because we need
   // a way to also execute the actions of the rules.
@@ -91,7 +90,7 @@ class WebRequestRulesRegistry : public RulesRegistryWithCache {
       const WebRequestData& request_data,
       bool crosses_incognito);
 
-  // Implementation of RulesRegistryWithCache:
+  // Implementation of RulesRegistry:
   virtual std::string AddRulesImpl(
       const std::string& extension_id,
       const std::vector<linked_ptr<RulesRegistry::Rule> >& rules) OVERRIDE;