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

chrome/browser/extensions/api/permissions/permissions_api_helpers.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/browser/extensions/api/permissions/permissions_api_helpers.h"
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/values.h"
 #include "chrome/common/extensions/api/permissions.h"
@@ skipping 53 matching lines @@
   for (URLPatternSet::const_iterator i = hosts.begin(); i != hosts.end(); ++i)
     permissions->origins->push_back(i->GetAsString());
 
   return scoped_ptr<Permissions>(permissions);
 }
 
 scoped_refptr<PermissionSet> UnpackPermissionSet(
     const Permissions& permissions,
     bool allow_file_access,
     std::string* error) {
+  DCHECK(error);
   APIPermissionSet apis;
   std::vector<std::string>* permissions_list = permissions.permissions.get();
   if (permissions_list) {
     PermissionsInfo* info = PermissionsInfo::GetInstance();
     for (std::vector<std::string>::iterator it = permissions_list->begin();
         it != permissions_list->end(); ++it) {
       // This is a compromise: we currently can't switch to a blend of
       // objects/strings all the way through the API. Until then, put this
       // processing here.
       // http://code.google.com/p/chromium/issues/detail?id=162042
@@ skipping 16 matching lines @@
         const APIPermissionInfo* usb_device_permission_info =
             info->GetByID(APIPermission::kUsbDevice);
         if (permission_name == usb_device_permission_info->name()) {
           permission = new UsbDevicePermission(usb_device_permission_info);
         } else {
           *error = kUnsupportedPermissionId;
           return NULL;
         }
 
         CHECK(permission);
-        if (!permission->FromValue(permission_json.get())) {
+        if (!permission->FromValue(permission_json.get(), NULL)) {
           *error = ErrorUtils::FormatErrorMessage(kInvalidParameter, *it);
           return NULL;
         }
         apis.insert(permission);
       } else {
         const APIPermissionInfo* permission_info = info->GetByName(*it);
         if (!permission_info) {
           *error = ErrorUtils::FormatErrorMessage(
               kUnknownPermissionError, *it);
           return NULL;
@@ skipping 26 matching lines @@
       origins.AddPattern(origin);
     }
   }
 
   return scoped_refptr<PermissionSet>(
       new PermissionSet(apis, manifest_permissions, origins, URLPatternSet()));
 }
 
 }  // namespace permissions_api_helpers
 }  // namespace extensions