Revert of Communicate ExtensionSettings policy to renderers

extensions/common/extension_messages.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/common/extension_messages.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 46 matching lines @@
 
 ExtensionMsg_Loaded_Params::~ExtensionMsg_Loaded_Params() {}
 
 ExtensionMsg_Loaded_Params::ExtensionMsg_Loaded_Params(
     const Extension* extension,
     bool include_tab_permissions)
     : manifest(extension->manifest()->value()->DeepCopy()),
       location(extension->location()),
       path(extension->path()),
       active_permissions(extension->permissions_data()->active_permissions()),
-      withheld_permissions(
-          extension->permissions_data()->withheld_permissions()),
-      policy_blocked_hosts(
-          extension->permissions_data()->policy_blocked_hosts()),
-      policy_allowed_hosts(
-          extension->permissions_data()->policy_allowed_hosts()),
-      uses_default_policy_blocked_allowed_hosts(
-          extension->permissions_data()->UsesDefaultPolicyHostRestrictions()),
+      withheld_permissions(extension->permissions_data()
+                               ->withheld_permissions()),
       id(extension->id()),
       creation_flags(extension->creation_flags()) {
   if (include_tab_permissions) {
     for (const auto& pair :
          extension->permissions_data()->tab_specific_permissions()) {
       tab_specific_permissions[pair.first] =
           ExtensionMsg_PermissionSetStruct(*pair.second);
     }
   }
 }
 
 ExtensionMsg_Loaded_Params::ExtensionMsg_Loaded_Params(
     const ExtensionMsg_Loaded_Params& other) = default;
 
 scoped_refptr<Extension> ExtensionMsg_Loaded_Params::ConvertToExtension(
     std::string* error) const {
   // We pass in the |id| to the create call because it will save work in the
   // normal case, and because in tests, extensions may not have paths or keys,
   // but it's important to retain the same id.
   scoped_refptr<Extension> extension =
       Extension::Create(path, location, *manifest, creation_flags, id, error);
   if (extension.get()) {
     const extensions::PermissionsData* permissions_data =
         extension->permissions_data();
     permissions_data->SetPermissions(active_permissions.ToPermissionSet(),
                                      withheld_permissions.ToPermissionSet());
-    if (uses_default_policy_blocked_allowed_hosts) {
-      permissions_data->SetUsesDefaultHostRestrictions();
-    } else {
-      permissions_data->SetPolicyHostRestrictions(policy_blocked_hosts,
-                                                  policy_allowed_hosts);
-    }
     for (const auto& pair : tab_specific_permissions) {
       permissions_data->UpdateTabSpecificPermissions(
           pair.first, *pair.second.ToPermissionSet());
     }
   }
   return extension;
 }
 
 namespace IPC {
 
@@ skipping 209 matching lines @@
   LogParam(p.type(), l);
   LogParam(p.id(), l);
 }
 
 void ParamTraits<ExtensionMsg_PermissionSetStruct>::GetSize(
     base::PickleSizer* s, const param_type& p) {
   GetParamSize(s, p.apis);
   GetParamSize(s, p.manifest_permissions);
   GetParamSize(s, p.explicit_hosts);
   GetParamSize(s, p.scriptable_hosts);
-  GetParamSize(s, p.policy_blocked_hosts);
-  GetParamSize(s, p.policy_allowed_hosts);
-  GetParamSize(s, p.uses_default_policy_host_restrictions);
 }
 
 void ParamTraits<ExtensionMsg_PermissionSetStruct>::Write(base::Pickle* m,
                                                           const param_type& p) {
   WriteParam(m, p.apis);
   WriteParam(m, p.manifest_permissions);
   WriteParam(m, p.explicit_hosts);
   WriteParam(m, p.scriptable_hosts);
-  WriteParam(m, p.policy_blocked_hosts);
-  WriteParam(m, p.policy_allowed_hosts);
-  WriteParam(m, p.uses_default_policy_host_restrictions);
 }
 
 bool ParamTraits<ExtensionMsg_PermissionSetStruct>::Read(
     const base::Pickle* m,
     base::PickleIterator* iter,
     param_type* p) {
   return ReadParam(m, iter, &p->apis) &&
          ReadParam(m, iter, &p->manifest_permissions) &&
          ReadParam(m, iter, &p->explicit_hosts) &&
-         ReadParam(m, iter, &p->scriptable_hosts) &&
-         ReadParam(m, iter, &p->policy_blocked_hosts) &&
-         ReadParam(m, iter, &p->policy_allowed_hosts) &&
-         ReadParam(m, iter, &p->uses_default_policy_host_restrictions);
+         ReadParam(m, iter, &p->scriptable_hosts);
 }
 
 void ParamTraits<ExtensionMsg_PermissionSetStruct>::Log(const param_type& p,
                                                         std::string* l) {
   LogParam(p.apis, l);
   LogParam(p.manifest_permissions, l);
   LogParam(p.explicit_hosts, l);
   LogParam(p.scriptable_hosts, l);
-  LogParam(p.policy_blocked_hosts, l);
-  LogParam(p.policy_allowed_hosts, l);
-  LogParam(p.uses_default_policy_host_restrictions, l);
 }
 
 void ParamTraits<ExtensionMsg_Loaded_Params>::Write(base::Pickle* m,
                                                     const param_type& p) {
   WriteParam(m, p.location);
   WriteParam(m, p.path);
   WriteParam(m, *(p.manifest));
   WriteParam(m, p.creation_flags);
   WriteParam(m, p.id);
   WriteParam(m, p.active_permissions);
   WriteParam(m, p.withheld_permissions);
   WriteParam(m, p.tab_specific_permissions);
-  WriteParam(m, p.policy_blocked_hosts);
-  WriteParam(m, p.policy_allowed_hosts);
-  WriteParam(m, p.uses_default_policy_blocked_allowed_hosts);
 }
 
 bool ParamTraits<ExtensionMsg_Loaded_Params>::Read(const base::Pickle* m,
                                                    base::PickleIterator* iter,
                                                    param_type* p) {
   p->manifest.reset(new base::DictionaryValue());
   return ReadParam(m, iter, &p->location) && ReadParam(m, iter, &p->path) &&
          ReadParam(m, iter, p->manifest.get()) &&
          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->policy_blocked_hosts) &&
-         ReadParam(m, iter, &p->policy_allowed_hosts) &&
-         ReadParam(m, iter, &p->uses_default_policy_blocked_allowed_hosts);
+         ReadParam(m, iter, &p->tab_specific_permissions);
 }
 
 void ParamTraits<ExtensionMsg_Loaded_Params>::Log(const param_type& p,
                                                   std::string* l) {
   l->append(p.id);
 }
 
 }  // namespace IPC