Declarative rules should be removed on uninstalling, not unloading

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>
@@ skipping 71 matching lines @@
   // Accessors for each type of rules registry.
   ContentRulesRegistry* content_rules_registry() const {
     CHECK(content_rules_registry_);
     return content_rules_registry_;
   }
 
   // Removes all rules registries of a given webview embedder process ID.
   void RemoveWebViewRulesRegistries(int process_id);
 
   // For testing.
-  void SimulateExtensionUnloaded(const std::string& extension_id);
+  void SimulateExtensionUninstalled(const std::string& extension_id);
+
  private:
   friend class ProfileKeyedAPIFactory<RulesRegistryService>;
 
   // Maps <event name, webview key> to RuleRegistries that handle these
   // events.
   typedef std::map<RulesRegistryKey, scoped_refptr<RulesRegistry> >
       RulesRegistryMap;
 
-  // 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;
 
+  // Iterates over all registries, and calls |notification_callback| on them
+  // with |extension_id| as the argument. If a registry lives on a different
+  // thread, the call is posted to that thread, so no guarantee of synchronous
+  // processing.
+  void NotifyRegistriesHelper(
+      void (RulesRegistry::*notification_callback)(const std::string&),
+      const std::string& extension_id);
+
   // 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<RulesCacheDelegate> cache_delegates_;
 
   // 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__