Reland "Encapsulate CSS selector declarative content condition tracking"

extensions/browser/api/declarative_content/content_rules_registry.h

 // Copyright (c) 2014 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 EXTENSIONS_BROWSER_API_DECLARATIVE_CONTENT_CONTENT_RULES_REGISTRY_H__
 #define EXTENSIONS_BROWSER_API_DECLARATIVE_CONTENT_CONTENT_RULES_REGISTRY_H__
 
 #include <string>
 
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/api/declarative/rules_registry.h"
 
 namespace content {
 class BrowserContext;
 class WebContents;
 struct FrameNavigateParams;
 struct LoadCommittedDetails;
 }
 
 namespace extensions {
 
 // This class acts as an //extensions-side interface for ContentRulesRegistry
 // 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,
                        const std::string& event_name,
                        content::BrowserThread::ID owner_thread,
                        RulesCacheDelegate* cache_delegate,
                        int rules_registry_id)
       : RulesRegistry(browser_context,
                       event_name,
                       owner_thread,
                       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(
       content::WebContents* tab,
       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(

[Mike Wittman, 2015/06/09 02:37:35]

I coalesced this back into DidNavigateMainFrame since all functions on this
interface must be called for both Original and OffTheRecord registries, and it
seems undesirable to duplicate every function for both cases.

This also allows us to encapsulate the non-trivial logic in TabHelper for
deciding which ContentRulesRegistries to use when invoking member functions.

-      content::WebContents* tab,
-      const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) = 0;
-
  protected:
   ~ContentRulesRegistry() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ContentRulesRegistry);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_API_DECLARATIVE_CONTENT_CONTENT_RULES_REGISTRY_H__