Reland "Encapsulate CSS selector declarative content condition tracking"

extensions/browser/api/declarative_content/content_rules_registry.h

Index: extensions/browser/api/declarative_content/content_rules_registry.h
diff --git a/extensions/browser/api/declarative_content/content_rules_registry.h b/extensions/browser/api/declarative_content/content_rules_registry.h
index f7f08bdb079a0ab36b3694c7ede75938861a130c..6063942f30571422f6582e5bf0083d1bd69c98c5 100644
--- a/extensions/browser/api/declarative_content/content_rules_registry.h
+++ b/extensions/browser/api/declarative_content/content_rules_registry.h
@@ -23,6 +23,12 @@ namespace extensions {
 // to allow RulesRegistryService to be moved to //extensions.
 // TODO(wjmaclean): Remove this once ContentRulesRegistry moves to
 // //extensions.
+//
+// Note: when dealing with WebContents associated with OffTheRecord contexts,
+// functions on this interface must be invoked for BOTH the Original and
+// OffTheRecord ContentRulesRegistry instances. This is necessary because the
+// Original ContentRulesRegistry instance handles spanning-mode incognito
+// extensions.
 class ContentRulesRegistry : public RulesRegistry {
  public:
   ContentRulesRegistry(content::BrowserContext* browser_context,
@@ -36,11 +42,9 @@ class ContentRulesRegistry : public RulesRegistry {
                       cache_delegate,
                       rules_registry_id) {}
 
-  // Applies all content rules given an update (CSS match change or
-  // page navigation, for now) from the renderer.
-  virtual void Apply(
-      content::WebContents* contents,
-      const std::vector<std::string>& matching_css_selectors) = 0;
+  // Notifies the registry that it should evaluate rules for |contents|.
+  virtual void MonitorWebContentsForRuleEvaluation(
+      content::WebContents* contents) = 0;
 
   // Applies all content rules given that a tab was just navigated.
   virtual void DidNavigateMainFrame(
@@ -48,13 +52,6 @@ class ContentRulesRegistry : public RulesRegistry {
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) = 0;
 
-  // Applies all content rules given that a tab was just navigated on the
-  // original context. Only invoked on the OffTheRecord registry instance.
-  virtual void DidNavigateMainFrameOfOriginalContext(
-      content::WebContents* tab,
-      const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) = 0;
-
  protected:
   ~ContentRulesRegistry() override {}