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

extensions/common/user_script_unittest.cc

Index: extensions/common/user_script_unittest.cc
diff --git a/extensions/common/user_script_unittest.cc b/extensions/common/user_script_unittest.cc
index 589b55506f3e7d01f5442cc831b5e4d6ec90ff5c..25f2ebc34684e0ac33515bce6452bf3335ba879f 100644
--- a/extensions/common/user_script_unittest.cc
+++ b/extensions/common/user_script_unittest.cc
@@ -193,7 +193,9 @@ TEST(ExtensionUserScriptTest, Pickle) {
   const int64 kId = 12;
   script1.set_id(kId);
   const std::string kExtensionId = "foo";
-  script1.set_extension_id(kExtensionId);
+  ConsumerID id(ConsumerID::EXTENSIONS, kExtensionId, ConsumerID::TAB,
+                ConsumerID::kDefaultInstanceID);
+  script1.set_consumer_id(id);
 
   Pickle pickle;
   script1.Pickle(&pickle);
@@ -218,7 +220,7 @@ TEST(ExtensionUserScriptTest, Pickle) {
   ASSERT_EQ(script1.url_patterns(), script2.url_patterns());
   ASSERT_EQ(script1.exclude_url_patterns(), script2.exclude_url_patterns());
 
-  EXPECT_EQ(kExtensionId, script2.extension_id());
+  EXPECT_EQ(kExtensionId, script2.GetExtensionID());
   EXPECT_EQ(kId, script2.id());
 }