| Index: extensions/common/user_script.cc
|
| diff --git a/extensions/common/user_script.cc b/extensions/common/user_script.cc
|
| index 7859e75f244cb0849ee6c91f46da3e314f3c1624..b8ba22e1d7639523157f3cf99abbafe666117255 100644
|
| --- a/extensions/common/user_script.cc
|
| +++ b/extensions/common/user_script.cc
|
| @@ -145,8 +145,6 @@
|
| pickle->WriteBool(is_incognito_enabled());
|
|
|
| PickleHostID(pickle, host_id_);
|
| - pickle->WriteInt(consumer_instance_type());
|
| - PickleRoutingInfo(pickle, routing_info_);
|
| PickleGlobs(pickle, globs_);
|
| PickleGlobs(pickle, exclude_globs_);
|
| PickleURLPatternSet(pickle, url_set_);
|
| @@ -167,12 +165,6 @@
|
| void UserScript::PickleHostID(::Pickle* pickle, const HostID& host_id) const {
|
| pickle->WriteInt(host_id.type());
|
| pickle->WriteString(host_id.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,
|
| @@ -208,13 +200,6 @@
|
| CHECK(iter->ReadBool(&incognito_enabled_));
|
|
|
| UnpickleHostID(pickle, iter, &host_id_);
|
| -
|
| - int consumer_instance_type = 0;
|
| - CHECK(iter->ReadInt(&consumer_instance_type));
|
| - consumer_instance_type_ =
|
| - static_cast<ConsumerInstanceType>(consumer_instance_type);
|
| -
|
| - UnpickleRoutingInfo(pickle, iter, &routing_info_);
|
| UnpickleGlobs(pickle, iter, &globs_);
|
| UnpickleGlobs(pickle, iter, &exclude_globs_);
|
| UnpickleURLPatternSet(pickle, iter, &url_set_);
|
| @@ -245,13 +230,6 @@
|
| *host_id = HostID(static_cast<HostID::HostType>(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) {
|
|
|