Refactor RulesRegistryWithCache to RulesRegistry

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

 // 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.
 
 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.h"
 
 #include <algorithm>
 #include <limits>
 #include <utility>
 
@@ skipping 18 matching lines @@
 const char kAllURLsPermissionNeeded[] =
     "To execute the action '*', you need to request host permission for all "
     "hosts.";
 
 }  // namespace
 
 namespace extensions {
 
 WebRequestRulesRegistry::WebRequestRulesRegistry(
     Profile* profile,
-    scoped_ptr<RulesRegistryWithCache::RuleStorageOnUI>* ui_part)
-    : RulesRegistryWithCache((ui_part ? profile : NULL),
-                             declarative_webrequest_constants::kOnRequest,
-                             content::BrowserThread::IO,
-                             true /*log_storage_init_delay*/,
-                             ui_part),
+    scoped_ptr<RulesCacheDelegate>* cache_delegate)
+    : RulesRegistry((cache_delegate ? profile : NULL),
+                         declarative_webrequest_constants::kOnRequest,
+                         content::BrowserThread::IO,
+                         true /*log_storage_init_delay*/,
+                         cache_delegate),
       profile_id_(profile) {
   if (profile)
     extension_info_map_ = ExtensionSystem::Get(profile)->info_map();
 }
 
 std::set<const WebRequestRule*> WebRequestRulesRegistry::GetMatches(
     const WebRequestData& request_data_without_ids) const {
   RuleSet result;
 
   WebRequestDataWithMatchIds request_data(&request_data_without_ids);
@@ skipping 345 matching lines @@
     RuleTriggers::const_iterator rule_trigger = rule_triggers_.find(*url_match);
     CHECK(rule_trigger != rule_triggers_.end());
     if (!ContainsKey(*result, rule_trigger->second) &&
         rule_trigger->second->conditions().IsFulfilled(*url_match,
                                                        request_data))
       result->insert(rule_trigger->second);
   }
 }
 
 }  // namespace extensions