Revert 170514

chrome/common/extensions/permissions/api_permission_set.cc

 // Copyright (c) 2012 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 "chrome/common/extensions/permissions/api_permission_set.h"
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
@@ skipping 15 matching lines @@
     const base::Value* permission_value,
     APIPermissionSet* api_permissions,
     string16* error,
     std::vector<std::string>* unhandled_permissions) {
   PermissionsInfo* info = PermissionsInfo::GetInstance();
 
   const APIPermissionInfo* permission_info = info->GetByName(permission_str);
   if (permission_info) {
     scoped_ptr<APIPermission> permission(
         permission_info->CreateAPIPermission());
-    if (permission->ManifestEntryForbidden()) {
-      if (error) {
-        *error = ErrorUtils::FormatErrorMessageUTF16(
-            errors::kPermissionNotAllowedInManifest, permission_info->name());
-        return false;
-      }
-      LOG(WARNING) << "Permission not allowed in manifest.";
-    } else if (!permission->FromValue(permission_value)) {
+    if (!permission->FromValue(permission_value)) {
       if (error) {
         *error = ErrorUtils::FormatErrorMessageUTF16(
             errors::kInvalidPermission, permission_info->name());
         return false;
       }
       LOG(WARNING) << "Parse permission failed.";
     } else {
       api_permissions->insert(permission.release());
     }
     return true;
@@ skipping 269 matching lines @@
     }
 
     if (!CreateAPIPermission(permission_str, permission_value,
         api_permissions, error, unhandled_permissions))
       return false;
   }
   return true;
 }
 
 }  // namespace extensions