Refactoring: de-couple Extensions from "script injection System" [render side]:2

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 b8ba22e1d7639523157f3cf99abbafe666117255..5bd059881baf85c41da163c923e63b8938cbbc80 100644
--- a/extensions/common/user_script.cc
+++ b/extensions/common/user_script.cc
@@ -145,6 +145,8 @@ void UserScript::Pickle(::Pickle* pickle) const {
   pickle->WriteBool(is_incognito_enabled());
 
   PickleHostID(pickle, host_id_);
+  PickleConsumerInstanceInfo(pickle, consumer_instance_info_);
+  PickleRoutingInfo(pickle, routing_info_);
   PickleGlobs(pickle, globs_);
   PickleGlobs(pickle, exclude_globs_);
   PickleURLPatternSet(pickle, url_set_);
@@ -167,6 +169,19 @@ void UserScript::PickleHostID(::Pickle* pickle, const HostID& host_id) const {
   pickle->WriteString(host_id.id());
 }
 
+void UserScript::PickleConsumerInstanceInfo(
+    ::Pickle* pickle,
+    const ConsumerInstanceInfo& instance_info) const {
+  pickle->WriteInt(instance_info.type());
+  pickle->WriteInt(instance_info.id());
+}
+
+void UserScript::PickleRoutingInfo(::Pickle* pickle,
+                                   const RoutingInfo& routing_info) const {
+  pickle->WriteInt(routing_info.render_process_id);
+  pickle->WriteInt(routing_info.render_view_id);
+}
+
 void UserScript::PickleURLPatternSet(::Pickle* pickle,
                                      const URLPatternSet& pattern_list) const {
   pickle->WriteSizeT(pattern_list.patterns().size());
@@ -200,6 +215,8 @@ void UserScript::Unpickle(const ::Pickle& pickle, PickleIterator* iter) {
   CHECK(iter->ReadBool(&incognito_enabled_));
 
   UnpickleHostID(pickle, iter, &host_id_);
+  UnpickleConsumerInstanceInfo(pickle, iter, &consumer_instance_info_);
+  UnpickleRoutingInfo(pickle, iter, &routing_info_);
   UnpickleGlobs(pickle, iter, &globs_);
   UnpickleGlobs(pickle, iter, &exclude_globs_);
   UnpickleURLPatternSet(pickle, iter, &url_set_);
@@ -230,6 +247,25 @@ void UserScript::UnpickleHostID(const ::Pickle& pickle,
   *host_id = HostID(static_cast<HostID::HostType>(type), id);
 }
 
+void UserScript::UnpickleConsumerInstanceInfo(
+    const ::Pickle& pickle,
+    PickleIterator* iter,
+    ConsumerInstanceInfo* consumer_instance_info) {
+  int type = 0;
+  int id = 0;
+  CHECK(iter->ReadInt(&type));
+  CHECK(iter->ReadInt(&id));
+  *consumer_instance_info = ConsumerInstanceInfo(
+      static_cast<ConsumerInstanceInfo::InstanceType>(type), id);
+}
+
+void UserScript::UnpickleRoutingInfo(const ::Pickle& pickle,
+                                     PickleIterator* iter,
+                                     RoutingInfo* routing_info) {
+  CHECK(iter->ReadInt(&routing_info->render_process_id));
+  CHECK(iter->ReadInt(&routing_info->render_view_id));
+}
+
 void UserScript::UnpickleURLPatternSet(const ::Pickle& pickle,
                                        PickleIterator* iter,
                                        URLPatternSet* pattern_list) {