Remove ContentRulesRegistry dependence from RulesRegistryService.

chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h

Index: chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h
diff --git a/chrome/browser/extensions/api/declarative_content/content_rules_registry.h b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h
similarity index 76%
rename from chrome/browser/extensions/api/declarative_content/content_rules_registry.h
rename to chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h
index d3b62908d0219409254df38cf2ea7df3a9570a39..073239b3f6b237fa3ed1c7a038835a9bf5d9830b 100644
--- a/chrome/browser/extensions/api/declarative_content/content_rules_registry.h
+++ b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h
@@ -2,8 +2,8 @@
 // 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_CONTENT_CONTENT_RULES_REGISTRY_H_
-#define CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_CONTENT_CONTENT_RULES_REGISTRY_H_
+#ifndef CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_CONTENT_CHROME_CONTENT_RULES_REGISTRY_H_
+#define CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_CONTENT_CHROME_CONTENT_RULES_REGISTRY_H_
 
 #include <map>
 #include <set>
@@ -20,7 +20,7 @@
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "extensions/browser/api/declarative/declarative_rule.h"
-#include "extensions/browser/api/declarative/rules_registry.h"
+#include "extensions/browser/api/declarative_content/content_rules_registry.h"
 #include "extensions/browser/info_map.h"
 
 class ContentPermissions;
@@ -47,7 +47,7 @@ class RulesRegistryService;
 
 typedef DeclarativeRule<ContentCondition, ContentAction> ContentRule;
 
-// The ContentRulesRegistry is responsible for managing
+// The ChromeContentRulesRegistry is responsible for managing
 // the internal representation of rules for the Declarative Content API.
 //
 // Here is the high level overview of this functionality:
@@ -59,23 +59,26 @@ typedef DeclarativeRule<ContentCondition, ContentAction> ContentRule;
 // The evaluation of URL related condition attributes (host_suffix, path_prefix)
 // is delegated to a URLMatcher, because this is capable of evaluating many
 // of such URL related condition attributes in parallel.
-class ContentRulesRegistry : public RulesRegistry,
-                             public content::NotificationObserver {
+class ChromeContentRulesRegistry : public ContentRulesRegistry,
+                                   public content::NotificationObserver {
  public:
   // For testing, |ui_part| can be NULL. In that case it constructs the
   // registry with storage functionality suspended.
-  ContentRulesRegistry(content::BrowserContext* browser_context,
-                       RulesCacheDelegate* cache_delegate);
+  ChromeContentRulesRegistry(content::BrowserContext* browser_context,
+                             RulesCacheDelegate* cache_delegate);
 
+  // ChromeContentRulesRegistryIntermediary implementation:

[Ken Rockot(use gerrit already), 2014/09/23 16:13:40]

nit: Update comment.

   // Applies all content rules given an update (CSS match change or
   // page navigation, for now) from the renderer.
-  void Apply(content::WebContents* contents,
-             const std::vector<std::string>& matching_css_selectors);
+  virtual void Apply(
+      content::WebContents* contents,
+      const std::vector<std::string>& matching_css_selectors) OVERRIDE;
 
   // Applies all content rules given that a tab was just navigated.
-  void DidNavigateMainFrame(content::WebContents* tab,
-                            const content::LoadCommittedDetails& details,
-                            const content::FrameNavigateParams& params);
+  virtual void DidNavigateMainFrame(
+      content::WebContents* tab,
+      const content::LoadCommittedDetails& details,
+      const content::FrameNavigateParams& params) OVERRIDE;
 
   // Implementation of RulesRegistry:
   virtual std::string AddRulesImpl(
@@ -96,17 +99,17 @@ class ContentRulesRegistry : public RulesRegistry,
   bool IsEmpty() const;
 
  protected:
-  virtual ~ContentRulesRegistry();
+  virtual ~ChromeContentRulesRegistry();
 
   // Virtual for testing:
   virtual base::Time GetExtensionInstallationTime(
       const std::string& extension_id) const;
 
  private:
-  friend class DeclarativeContentRulesRegistryTest;
+  friend class DeclarativeChromeContentRulesRegistryTest;
 
-  std::set<ContentRule*>
-  GetMatches(const RendererContentMatchData& renderer_data) const;
+  std::set<ContentRule*> GetMatches(
+      const RendererContentMatchData& renderer_data) const;
 
   // Scans the rules for the set of conditions they're watching.  If the set has
   // changed, calls InstructRenderProcess() for each RenderProcessHost in the
@@ -143,9 +146,9 @@ class ContentRulesRegistry : public RulesRegistry,
 
   scoped_refptr<InfoMap> extension_info_map_;
 
-  DISALLOW_COPY_AND_ASSIGN(ContentRulesRegistry);
+  DISALLOW_COPY_AND_ASSIGN(ChromeContentRulesRegistry);
 };
 
 }  // namespace extensions
 
-#endif  // CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_CONTENT_CONTENT_RULES_REGISTRY_H_
+#endif  // CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_CONTENT_CHROME_CONTENT_RULES_REGISTRY_H_