Refactor RulesRegistryWithCache to RulesRegistry

chrome/browser/extensions/api/declarative/rules_registry_service.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_RULES_REGISTRY_SERVICE_H__
 #define CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_RULES_REGISTRY_SERVICE_H__
 
 #include <map>
 #include <string>
 #include <vector>
 
 #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"
 #include "content/public/browser/notification_registrar.h"
 
 class Profile;
 
 namespace content {
 class NotificationSource;
 class NotificationSource;
@@ skipping 40 matching lines @@
   ContentRulesRegistry* content_rules_registry() const {
     return content_rules_registry_;
   }
 
   // For testing.
   void SimulateExtensionUnloaded(const std::string& extension_id);
  private:
   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;

[vabr (Chromium), 2013/10/29 16:05:54]

nit: This line seems to actually fit on one line.

 
   // Notifies all RulesRegistries that |extension_id| was unloaded.
   // It is not guaranteed that this notification is processed synchronously.
   // If extensions live on another thread, the notification is posted.
   void OnExtensionUnloaded(const std::string& extension_id);
 
   // Implementation of content::NotificationObserver.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // ProfileKeyedAPI implementation.
   static const char* service_name() {
     return "RulesRegistryService";
   }
   static const bool kServiceHasOwnInstanceInIncognito = true;
   static const bool kServiceIsNULLWhileTesting = true;
 
   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.
   ContentRulesRegistry* content_rules_registry_;
 
   content::NotificationRegistrar registrar_;
 
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(RulesRegistryService);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_RULES_REGISTRY_SERVICE_H__