Browser changes for wiring up RequestContentScript API to shared memory

chrome/browser/extensions/api/declarative_content/content_action_unittest.cc

Index: chrome/browser/extensions/api/declarative_content/content_action_unittest.cc
diff --git a/chrome/browser/extensions/api/declarative_content/content_action_unittest.cc b/chrome/browser/extensions/api/declarative_content/content_action_unittest.cc
index bf29bb5dfcd4372223ab480dd77bd1724fa67c5f..a5945ec34577cfcb9be1c4c4d893b360fa509da7 100644
--- a/chrome/browser/extensions/api/declarative_content/content_action_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_content/content_action_unittest.cc
@@ -29,21 +29,23 @@ TEST(DeclarativeContentActionTest, InvalidCreation) {
 
   // Test wrong data type passed.
   error.clear();
-  result = ContentAction::Create(NULL, *ParseJson("[]"), &error, &bad_message);
+  result = ContentAction::Create(
+      NULL, NULL, *ParseJson("[]"), &error, &bad_message);
   EXPECT_TRUE(bad_message);
   EXPECT_EQ("", error);
   EXPECT_FALSE(result.get());
 
   // Test missing instanceType element.
   error.clear();
-  result = ContentAction::Create(NULL, *ParseJson("{}"), &error, &bad_message);
+  result = ContentAction::Create(
+      NULL, NULL, *ParseJson("{}"), &error, &bad_message);
   EXPECT_TRUE(bad_message);
   EXPECT_EQ("", error);
   EXPECT_FALSE(result.get());
 
   // Test wrong instanceType element.
   error.clear();
-  result = ContentAction::Create(NULL, *ParseJson(
+  result = ContentAction::Create(NULL, NULL, *ParseJson(
       "{\n"
       "  \"instanceType\": \"declarativeContent.UnknownType\",\n"
       "}"),
@@ -59,6 +61,7 @@ TEST(DeclarativeContentActionTest, ShowPageActionWithoutPageAction) {
   std::string error;
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
+      NULL,
       extension,
       *ParseJson(
            "{\n"
@@ -79,6 +82,7 @@ TEST(DeclarativeContentActionTest, ShowPageAction) {
   std::string error;
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
+      NULL,
       extension,
       *ParseJson(
            "{\n"
@@ -116,6 +120,7 @@ TEST(DeclarativeContentActionTest, RequestContentScriptMissingScripts) {
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
       NULL,
+      NULL,
       *ParseJson(
           "{\n"
           "  \"instanceType\": \"declarativeContent.RequestContentScript\",\n"
@@ -136,6 +141,7 @@ TEST(DeclarativeContentActionTest, RequestContentScriptCSS) {
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
       NULL,
+      NULL,
       *ParseJson(
           "{\n"
           "  \"instanceType\": \"declarativeContent.RequestContentScript\",\n"
@@ -156,6 +162,7 @@ TEST(DeclarativeContentActionTest, RequestContentScriptJS) {
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
       NULL,
+      NULL,
       *ParseJson(
           "{\n"
           "  \"instanceType\": \"declarativeContent.RequestContentScript\",\n"
@@ -176,6 +183,7 @@ TEST(DeclarativeContentActionTest, RequestContentScriptCSSBadType) {
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
       NULL,
+      NULL,
       *ParseJson(
           "{\n"
           "  \"instanceType\": \"declarativeContent.RequestContentScript\",\n"
@@ -194,6 +202,7 @@ TEST(DeclarativeContentActionTest, RequestContentScriptJSBadType) {
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
       NULL,
+      NULL,
       *ParseJson(
           "{\n"
           "  \"instanceType\": \"declarativeContent.RequestContentScript\",\n"
@@ -212,6 +221,7 @@ TEST(DeclarativeContentActionTest, RequestContentScriptAllFrames) {
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
       NULL,
+      NULL,
       *ParseJson(
           "{\n"
           "  \"instanceType\": \"declarativeContent.RequestContentScript\",\n"
@@ -233,6 +243,7 @@ TEST(DeclarativeContentActionTest, RequestContentScriptMatchAboutBlank) {
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
       NULL,
+      NULL,
       *ParseJson(
           "{\n"
           "  \"instanceType\": \"declarativeContent.RequestContentScript\",\n"
@@ -254,6 +265,7 @@ TEST(DeclarativeContentActionTest, RequestContentScriptAllFramesBadType) {
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
       NULL,
+      NULL,
       *ParseJson(
           "{\n"
           "  \"instanceType\": \"declarativeContent.RequestContentScript\",\n"
@@ -273,6 +285,7 @@ TEST(DeclarativeContentActionTest, RequestContentScriptMatchAboutBlankBadType) {
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
       NULL,
+      NULL,
       *ParseJson(
           "{\n"
           "  \"instanceType\": \"declarativeContent.RequestContentScript\",\n"