Browser changes for wiring up RequestContentScript API to shared memory

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

Index: chrome/browser/extensions/api/declarative_content/content_action.h
diff --git a/chrome/browser/extensions/api/declarative_content/content_action.h b/chrome/browser/extensions/api/declarative_content/content_action.h
index bb18d02996bbf21e3d3cd319d03c1498e00b9ebe..c0eb051bf5a9bd939eb1f5b93cdf3a0628527d7b 100644
--- a/chrome/browser/extensions/api/declarative_content/content_action.h
+++ b/chrome/browser/extensions/api/declarative_content/content_action.h
@@ -45,13 +45,17 @@ class ContentAction : public base::RefCounted<ContentAction> {
 
   // Applies or reverts this ContentAction on a particular tab for a particular
   // extension.  Revert exists to keep the actions up to date as the page
-  // changes.
+  // changes.  Reapply exists to reapply changes to a new page, even if the
+  // previous page also matched relevant conditions.
   virtual void Apply(const std::string& extension_id,
                      const base::Time& extension_install_time,
                      ApplyInfo* apply_info) const = 0;
   virtual void Revert(const std::string& extension_id,
                       const base::Time& extension_install_time,
                       ApplyInfo* apply_info) const = 0;
+  virtual void Reapply(const std::string& extension_id,
+                     const base::Time& extension_install_time,

[Devlin, 2014/08/21 17:14:09]

indentation.

[Mark Dittmer, 2014/08/21 21:25:12]

Done.

+                     ApplyInfo* apply_info) const = 0;
 
   // Factory method that instantiates a concrete ContentAction
   // implementation according to |json_action|, the representation of the
@@ -59,7 +63,8 @@ class ContentAction : public base::RefCounted<ContentAction> {
   // Sets |error| and returns NULL in case of a semantic error that cannot
   // be caught by schema validation. Sets |bad_message| and returns NULL
   // in case the input is syntactically unexpected.
-  static scoped_refptr<ContentAction> Create(const Extension* extension,
+  static scoped_refptr<ContentAction> Create(Profile* profile,
+                                             const Extension* extension,
                                              const base::Value& json_action,
                                              std::string* error,
                                              bool* bad_message);