Extensions: Make it possible for permission parsing code to return a detailed error message.

extensions/common/permissions/api_permission_set.cc

 // Copyright 2013 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/permissions/api_permission_set.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
@@ skipping 23 matching lines @@
     if (source != APIPermissionSet::kAllowInternalPermissions &&
         permission_info->is_internal()) {
       // An internal permission specified in permissions list is an error.
       if (error) {
         *error = ErrorUtils::FormatErrorMessageUTF16(
             errors::kPermissionNotAllowedInManifest, permission_str);
       }
       return false;
     }
 
-    if (!permission->FromValue(permission_value)) {
+    std::string error_details;
+    if (!permission->FromValue(permission_value, &error_details)) {
       if (error) {
-        *error = ErrorUtils::FormatErrorMessageUTF16(
-            errors::kInvalidPermission, permission_info->name());
+        if (error_details.empty()) {
+          *error = ErrorUtils::FormatErrorMessageUTF16(
+              errors::kInvalidPermission,
+              permission_info->name());
+        } else {
+          *error = ErrorUtils::FormatErrorMessageUTF16(
+              errors::kInvalidPermissionWithDetail,
+              permission_info->name(),
+              error_details);
+        }
         return false;
       }
       LOG(WARNING) << "Parse permission failed.";
     } else {
       api_permissions->insert(permission.release());
     }
     return true;
   }
 
   if (unhandled_permissions)
@@ skipping 108 matching lines @@
   // The fileSystem.write and fileSystem.directory permissions imply
   // fileSystem.writeDirectory.
   // TODO(sammc): Remove this. See http://crbug.com/284849.
   if (ContainsKey(map(), APIPermission::kFileSystemWrite) &&
       ContainsKey(map(), APIPermission::kFileSystemDirectory)) {
     insert(APIPermission::kFileSystemWriteDirectory);
   }
 }
 
 }  // namespace extensions