Reland "Encapsulate CSS selector declarative content condition tracking"

chrome/browser/extensions/tab_helper.h

Index: chrome/browser/extensions/tab_helper.h
diff --git a/chrome/browser/extensions/tab_helper.h b/chrome/browser/extensions/tab_helper.h
index 4608a064514dc6e9094109b2b5d87fb024d1c0f3..48d48bb6c9f18a9af26a45df77365f7827a58d5e 100644
--- a/chrome/browser/extensions/tab_helper.h
+++ b/chrome/browser/extensions/tab_helper.h
@@ -7,7 +7,6 @@
 
 #include <set>
 #include <string>
-#include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ -125,6 +124,11 @@ class TabHelper : public content::WebContentsObserver,
       WebstoreInlineInstallerFactory* factory);
 
  private:
+  // Utility function to invoke member functions on all relevant
+  // ContentRulesRegistries.
+  template <class Func>
+  void InvokeForContentRulesRegistries(const Func& func);
+
   // Different types of action when web app info is available.
   // OnDidGetApplicationInfo uses this to dispatch calls.
   enum WebAppAction {
@@ -171,7 +175,6 @@ class TabHelper : public content::WebContentsObserver,
   void OnContentScriptsExecuting(
       const ScriptExecutionObserver::ExecutingScriptsMap& extension_ids,
       const GURL& on_url);
-  void OnWatchedPageChange(const std::vector<std::string>& css_selectors);
   void OnDetailedConsoleMessageAdded(const base::string16& message,
                                      const base::string16& source,
                                      const StackTrace& stack_trace,
@@ -214,6 +217,8 @@ class TabHelper : public content::WebContentsObserver,
 
   // Data for app extensions ---------------------------------------------------

[not at google - send to devlin, 2015/06/09 20:38:11]

This comment seems entirely out of place. Can you delete it, cos, why not?

[Mike Wittman, 2015/06/09 22:05:56]

Yes, I found this odd also. Removed.

 
+  Profile* profile_;
+
   // Our content script observers. Declare at top so that it will outlive all
   // other members, since they might add themselves as observers.
   base::ObserverList<ScriptExecutionObserver> script_execution_observers_;
@@ -255,8 +260,6 @@ class TabHelper : public content::WebContentsObserver,
 
   scoped_ptr<BookmarkAppHelper> bookmark_app_helper_;
 
-  Profile* profile_;
-
   // Creates WebstoreInlineInstaller instances for inline install triggers.
   scoped_ptr<WebstoreInlineInstallerFactory> webstore_inline_installer_factory_;