Refactor RulesRegistryWithCache to RulesRegistry

chrome/browser/extensions/api/declarative_webrequest/webrequest_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_WEBREQUEST_WEBREQUEST_RULES_REGISTRY_H_
 #define CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_WEBREQUEST_WEBREQUEST_RULES_REGISTRY_H_
 
 #include <list>
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #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_webrequest/request_stage.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_action.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.h"
 #include "chrome/browser/extensions/extension_info_map.h"
 #include "extensions/common/matcher/url_matcher.h"
 
 class Profile;
 class WebRequestPermissions;
 
 namespace extension_web_request_api_helpers {
@@ skipping 33 matching lines @@
 // is delegated to a URLMatcher, because this is capable of evaluating many
 // of such URL related condition attributes in parallel.
 //
 // For this, the URLRequestCondition has a URLMatcherConditionSet, which
 // represents the {'host_suffix': 'example.com', 'path_prefix': '/query'} part.
 // We will then ask the URLMatcher, whether a given URL
 // "http://www.example.com/query/" has any matches, and the URLMatcher
 // 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.
   std::set<const WebRequestRule*> GetMatches(
       const WebRequestData& request_data_without_ids) const;
 
   // Returns which modifications should be executed on the network request
   // according to the rules registered in this registry.
   std::list<LinkedPtrEventResponseDelta> CreateDeltas(
       const ExtensionInfoMap* extension_info_map,
       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;
   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;
 
   // Returns true if this object retains no allocated data. Only for debugging.
@@ skipping 79 matching lines @@
 
   void* profile_id_;
   scoped_refptr<ExtensionInfoMap> extension_info_map_;
 
   DISALLOW_COPY_AND_ASSIGN(WebRequestRulesRegistry);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_WEBREQUEST_WEBREQUEST_RULES_REGISTRY_H_