Revert of Revert of Introduce HostID and de-couple Extensions from "script injection System" [browser side]

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 e028ac18f846a1984e1c5b22af993211ffa3f0cf..0f86d5fe710e11d1605241049aeb2d8500f54529 100644
--- a/chrome/browser/extensions/api/declarative_content/content_action_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_content/content_action_unittest.cc
@@ -74,7 +74,7 @@
   // Test wrong data type passed.
   error.clear();
   result = ContentAction::Create(
-      NULL, NULL, *ParseJson("[]"), &error, &bad_message);
+      NULL, HostID(), NULL, *ParseJson("[]"), &error, &bad_message);
   EXPECT_TRUE(bad_message);
   EXPECT_EQ("", error);
   EXPECT_FALSE(result.get());
@@ -82,14 +82,14 @@
   // Test missing instanceType element.
   error.clear();
   result = ContentAction::Create(
-      NULL, NULL, *ParseJson("{}"), &error, &bad_message);
+      NULL, HostID(), 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, NULL, *ParseJson(
+  result = ContentAction::Create(NULL, HostID(), NULL, *ParseJson(
       "{\n"
       "  \"instanceType\": \"declarativeContent.UnknownType\",\n"
       "}"),
@@ -106,6 +106,7 @@
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
       NULL,
+      HostID(HostID::EXTENSIONS, extension->id()),
       extension,
       *ParseJson(
            "{\n"
@@ -127,6 +128,7 @@
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
       NULL,
+      HostID(HostID::EXTENSIONS, extension->id()),
       extension,
       *ParseJson(
            "{\n"
@@ -185,6 +187,7 @@
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
       NULL,
+      HostID(HostID::EXTENSIONS, extension->id()),
       extension,
       *dict,
       &error,
@@ -217,6 +220,7 @@
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
       profile(),
+      HostID(HostID::EXTENSIONS, extension()->id()),
       extension(),
       *ParseJson(
           "{\n"
@@ -237,6 +241,7 @@
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
       profile(),
+      HostID(HostID::EXTENSIONS, extension()->id()),
       extension(),
       *ParseJson(
           "{\n"
@@ -257,6 +262,7 @@
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
       profile(),
+      HostID(HostID::EXTENSIONS, extension()->id()),
       extension(),
       *ParseJson(
           "{\n"
@@ -277,6 +283,7 @@
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
       profile(),
+      HostID(HostID::EXTENSIONS, extension()->id()),
       extension(),
       *ParseJson(
           "{\n"
@@ -295,6 +302,7 @@
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
       profile(),
+      HostID(HostID::EXTENSIONS, extension()->id()),
       extension(),
       *ParseJson(
           "{\n"
@@ -313,6 +321,7 @@
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
       profile(),
+      HostID(HostID::EXTENSIONS, extension()->id()),
       extension(),
       *ParseJson(
           "{\n"
@@ -334,6 +343,7 @@
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
       profile(),
+      HostID(HostID::EXTENSIONS, extension()->id()),
       extension(),
       *ParseJson(
           "{\n"
@@ -355,6 +365,7 @@
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
       profile(),
+      HostID(HostID::EXTENSIONS, extension()->id()),
       extension(),
       *ParseJson(
           "{\n"
@@ -374,6 +385,7 @@
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
       profile(),
+      HostID(HostID::EXTENSIONS, extension()->id()),
       extension(),
       *ParseJson(
           "{\n"