Browser changes for wiring up RequestContentScript API to shared memory

chrome/browser/extensions/api/declarative/declarative_rule_unittest.cc

Index: chrome/browser/extensions/api/declarative/declarative_rule_unittest.cc
diff --git a/chrome/browser/extensions/api/declarative/declarative_rule_unittest.cc b/chrome/browser/extensions/api/declarative/declarative_rule_unittest.cc
index c85d9863fe062f2804381fe51df36276e76d1cc6..8eeda274725a92be345286eeb1e82b9cf5403edc 100644
--- a/chrome/browser/extensions/api/declarative/declarative_rule_unittest.cc
+++ b/chrome/browser/extensions/api/declarative/declarative_rule_unittest.cc
@@ -217,10 +217,12 @@ class SummingAction : public base::RefCounted<SummingAction> {
   SummingAction(int increment, int min_priority)
       : increment_(increment), min_priority_(min_priority) {}
 
-  static scoped_refptr<const SummingAction> Create(const Extension* extension,
-                                                   const base::Value& action,
-                                                   std::string* error,
-                                                   bool* bad_message) {
+  static scoped_refptr<const SummingAction> Create(
+      content::BrowserContext* browser_context,
+      const Extension* extension,
+      const base::Value& action,
+      std::string* error,
+      bool* bad_message) {
     int increment = 0;
     int min_priority = 0;
     const base::DictionaryValue* dict = NULL;
@@ -268,7 +270,7 @@ TEST(DeclarativeActionTest, ErrorActionSet) {
   std::string error;
   bool bad = false;
   scoped_ptr<SummingActionSet> result =
-      SummingActionSet::Create(NULL, actions, &error, &bad);
+      SummingActionSet::Create(NULL, NULL, actions, &error, &bad);
   EXPECT_EQ("the error", error);
   EXPECT_FALSE(bad);
   EXPECT_FALSE(result);
@@ -276,7 +278,7 @@ TEST(DeclarativeActionTest, ErrorActionSet) {
   actions.clear();
   actions.push_back(ScopedToLinkedPtr(ParseJson("{\"value\": 1}")));
   actions.push_back(ScopedToLinkedPtr(ParseJson("{\"bad\": 3}")));
-  result = SummingActionSet::Create(NULL, actions, &error, &bad);
+  result = SummingActionSet::Create(NULL, NULL, actions, &error, &bad);
   EXPECT_EQ("", error);
   EXPECT_TRUE(bad);
   EXPECT_FALSE(result);
@@ -293,7 +295,7 @@ TEST(DeclarativeActionTest, ApplyActionSet) {
   std::string error;
   bool bad = false;
   scoped_ptr<SummingActionSet> result =
-      SummingActionSet::Create(NULL, actions, &error, &bad);
+      SummingActionSet::Create(NULL, NULL, actions, &error, &bad);
   EXPECT_EQ("", error);
   EXPECT_FALSE(bad);
   ASSERT_TRUE(result);
@@ -335,6 +337,7 @@ TEST(DeclarativeRuleTest, Create) {
   URLMatcher matcher;
   std::string error;
   scoped_ptr<Rule> rule(Rule::Create(matcher.condition_factory(),
+                                     NULL,
                                      extension.get(),
                                      install_time,
                                      json_rule,
@@ -403,6 +406,7 @@ TEST(DeclarativeRuleTest, CheckConsistency) {
                  "}"),
       json_rule.get()));
   scoped_ptr<Rule> rule(Rule::Create(matcher.condition_factory(),
+                                     NULL,
                                      extension.get(),
                                      base::Time(),
                                      json_rule,
@@ -425,6 +429,7 @@ TEST(DeclarativeRuleTest, CheckConsistency) {
                  "}"),
       json_rule.get()));
   rule = Rule::Create(matcher.condition_factory(),
+                      NULL,
                       extension.get(),
                       base::Time(),
                       json_rule,