| Index: chrome/common/extensions/api/extension_api.cc
|
| diff --git a/chrome/common/extensions/api/extension_api.cc b/chrome/common/extensions/api/extension_api.cc
|
| index 14a6562b99de513511a1df06b2e63b78147958c1..40773c38304bad745dc5903a6570dfc965b190c0 100644
|
| --- a/chrome/common/extensions/api/extension_api.cc
|
| +++ b/chrome/common/extensions/api/extension_api.cc
|
| @@ -75,7 +75,6 @@ static base::ListValue* LoadSchemaList(int resource_id) {
|
| kAllowTrailingCommas,
|
| NULL, // error code
|
| &error_message);
|
| - CHECK(result) << error_message;
|
| CHECK(result->IsType(base::Value::TYPE_LIST));
|
| return static_cast<base::ListValue*>(result);
|
| }
|
| @@ -127,11 +126,12 @@ ExtensionAPI::ExtensionAPI() {
|
| IDR_EXTENSION_API_JSON_EXTENSION,
|
| IDR_EXTENSION_API_JSON_FILEBROWSERHANDLER,
|
| IDR_EXTENSION_API_JSON_FILEBROWSERPRIVATE,
|
| + IDR_EXTENSION_API_JSON_GENERATED,
|
| IDR_EXTENSION_API_JSON_HISTORY,
|
| IDR_EXTENSION_API_JSON_I18N,
|
| IDR_EXTENSION_API_JSON_IDLE,
|
| - IDR_EXTENSION_API_JSON_INPUT_IME,
|
| IDR_EXTENSION_API_JSON_INPUTMETHODPRIVATE,
|
| + IDR_EXTENSION_API_JSON_INPUT_IME,
|
| IDR_EXTENSION_API_JSON_MANAGEMENT,
|
| IDR_EXTENSION_API_JSON_MEDIAPLAYERPRIVATE,
|
| IDR_EXTENSION_API_JSON_METRICSPRIVATE,
|
|
|