| Index: extensions/common/extension_messages.cc
|
| diff --git a/extensions/common/extension_messages.cc b/extensions/common/extension_messages.cc
|
| index 34b15ed89879781b77bbc59636d0d0a2420a2d89..a304790f28c63d468e74afc46f8ba025e8aa4425 100644
|
| --- a/extensions/common/extension_messages.cc
|
| +++ b/extensions/common/extension_messages.cc
|
| @@ -63,8 +63,12 @@ ExtensionMsg_Loaded_Params::ExtensionMsg_Loaded_Params(
|
| location(extension->location()),
|
| path(extension->path()),
|
| active_permissions(extension->permissions_data()->active_permissions()),
|
| - withheld_permissions(extension->permissions_data()
|
| - ->withheld_permissions()),
|
| + withheld_permissions(
|
| + extension->permissions_data()->withheld_permissions()),
|
| + runtime_blocked_hosts(
|
| + extension->permissions_data()->runtime_blocked_hosts()),
|
| + runtime_allowed_hosts(
|
| + extension->permissions_data()->runtime_allowed_hosts()),
|
| id(extension->id()),
|
| creation_flags(extension->creation_flags()) {
|
| if (include_tab_permissions) {
|
| @@ -91,6 +95,8 @@ scoped_refptr<Extension> ExtensionMsg_Loaded_Params::ConvertToExtension(
|
| extension->permissions_data();
|
| permissions_data->SetPermissions(active_permissions.ToPermissionSet(),
|
| withheld_permissions.ToPermissionSet());
|
| + permissions_data->SetRuntimeBlockedAllowedHosts(runtime_blocked_hosts,
|
| + runtime_allowed_hosts);
|
| for (const auto& pair : tab_specific_permissions) {
|
| permissions_data->UpdateTabSpecificPermissions(
|
| pair.first, *pair.second.ToPermissionSet());
|
| @@ -381,6 +387,8 @@ void ParamTraits<ExtensionMsg_Loaded_Params>::Write(base::Pickle* m,
|
| WriteParam(m, p.active_permissions);
|
| WriteParam(m, p.withheld_permissions);
|
| WriteParam(m, p.tab_specific_permissions);
|
| + WriteParam(m, p.runtime_blocked_hosts);
|
| + WriteParam(m, p.runtime_allowed_hosts);
|
| }
|
|
|
| bool ParamTraits<ExtensionMsg_Loaded_Params>::Read(const base::Pickle* m,
|
| @@ -392,7 +400,9 @@ bool ParamTraits<ExtensionMsg_Loaded_Params>::Read(const base::Pickle* m,
|
| ReadParam(m, iter, &p->creation_flags) && ReadParam(m, iter, &p->id) &&
|
| ReadParam(m, iter, &p->active_permissions) &&
|
| ReadParam(m, iter, &p->withheld_permissions) &&
|
| - ReadParam(m, iter, &p->tab_specific_permissions);
|
| + ReadParam(m, iter, &p->tab_specific_permissions) &&
|
| + ReadParam(m, iter, &p->runtime_blocked_hosts) &&
|
| + ReadParam(m, iter, &p->runtime_allowed_hosts);
|
| }
|
|
|
| void ParamTraits<ExtensionMsg_Loaded_Params>::Log(const param_type& p,
|
|
|