Refactor RulesRegistryWithCache to RulesRegistry

chrome/browser/extensions/api/declarative/rules_registry_service.h

Index: chrome/browser/extensions/api/declarative/rules_registry_service.h
diff --git a/chrome/browser/extensions/api/declarative/rules_registry_service.h b/chrome/browser/extensions/api/declarative/rules_registry_service.h
index ee8833e3d49c85290740a4eb7b6de5484dc3de50..f4816da9d01e89013f41209a805cfcfbd9e06a55 100644
--- a/chrome/browser/extensions/api/declarative/rules_registry_service.h
+++ b/chrome/browser/extensions/api/declarative/rules_registry_service.h
@@ -12,7 +12,7 @@
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.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/profile_keyed_api_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/notification_observer.h"
@@ -73,7 +73,8 @@ class RulesRegistryService : public ProfileKeyedAPI,
   friend class ProfileKeyedAPIFactory<RulesRegistryService>;
 
   // Maps event names to RuleRegistries that handle these events.
-  typedef std::map<std::string, scoped_refptr<RulesRegistry> > RulesRegistryMap;
+  typedef std::map<std::string, scoped_refptr<RulesRegistry> >
+      RulesRegistryMap;
 
   // Notifies all RulesRegistries that |extension_id| was unloaded.
   // It is not guaranteed that this notification is processed synchronously.
@@ -95,7 +96,7 @@ class RulesRegistryService : public ProfileKeyedAPI,
   RulesRegistryMap rule_registries_;
 
   // We own the parts of the registries which need to run on the UI thread.
-  ScopedVector<RulesRegistryWithCache::RuleStorageOnUI> ui_parts_of_registries_;
+  ScopedVector<RulesCacheDelegate> ui_parts_of_registries_;
 
   // Weak pointer into rule_registries_ to make it easier to handle content rule
   // conditions.