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

extensions/common/user_script.cc

Index: extensions/common/user_script.cc
diff --git a/extensions/common/user_script.cc b/extensions/common/user_script.cc
index 6f79887e2806760f778eeb307a933e842a6b470c..f4782d0c3c13d77834a33abaf901fc338c4fabe6 100644
--- a/extensions/common/user_script.cc
+++ b/extensions/common/user_script.cc
@@ -145,6 +145,7 @@ void UserScript::Pickle(::Pickle* pickle) const {
   pickle->WriteBool(match_about_blank());
   pickle->WriteBool(is_incognito_enabled());
 
+  PickleConsumerID(pickle, consumer_id());
   PickleGlobs(pickle, globs_);
   PickleGlobs(pickle, exclude_globs_);
   PickleURLPatternSet(pickle, url_set_);
@@ -162,6 +163,14 @@ void UserScript::PickleGlobs(::Pickle* pickle,
   }
 }
 
+void UserScript::PickleConsumerID(::Pickle* pickle,
+                                  const ConsumerID& consumer_id) const {
+  pickle->WriteInt(consumer_id.host_type);
+  pickle->WriteString(consumer_id.host_id);
+  pickle->WriteInt(consumer_id.instance_type);
+  pickle->WriteInt(consumer_id.instance_id);
+}
+
 void UserScript::PickleURLPatternSet(::Pickle* pickle,
                                      const URLPatternSet& pattern_list) const {
   pickle->WriteSizeT(pattern_list.patterns().size());
@@ -195,6 +204,7 @@ void UserScript::Unpickle(const ::Pickle& pickle, PickleIterator* iter) {
   CHECK(iter->ReadBool(&match_about_blank_));
   CHECK(iter->ReadBool(&incognito_enabled_));
 
+  UnpickleConsumerID(pickle, iter, &consumer_id_);
   UnpickleGlobs(pickle, iter, &globs_);
   UnpickleGlobs(pickle, iter, &exclude_globs_);
   UnpickleURLPatternSet(pickle, iter, &url_set_);
@@ -215,6 +225,19 @@ void UserScript::UnpickleGlobs(const ::Pickle& pickle, PickleIterator* iter,
   }
 }
 
+void UserScript::UnpickleConsumerID(const ::Pickle& pickle,
+                                    PickleIterator* iter,
+                                    ConsumerID* consumer_id) {
+  int host_type;
+  int instance_type;
+  CHECK(iter->ReadInt(&host_type));
+  consumer_id->host_type = static_cast<HostType>(host_type);
+  CHECK(iter->ReadString(&consumer_id->host_id));
+  CHECK(iter->ReadInt(&instance_type));
+  consumer_id->instance_type = static_cast<InstanceType>(instance_type);
+  CHECK(iter->ReadInt(&consumer_id->instance_id));
+}
+
 void UserScript::UnpickleURLPatternSet(const ::Pickle& pickle,
                                        PickleIterator* iter,
                                        URLPatternSet* pattern_list) {