diff options
| author | rockot@chromium.org <rockot@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-31 03:45:48 +0000 |
|---|---|---|
| committer | rockot@chromium.org <rockot@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-31 03:45:48 +0000 |
| commit | 662963506827f9b94c6f69dc8d0a7eb3487d795a (patch) | |
| tree | ff09d0bd6a9fb2c43f036c716c3b7ef3aa636fbf /extensions/common/extension_api.cc | |
| parent | b2b8a03125e60e881e39da3560f9a49c0d6db609 (diff) | |
| download | chromium_src-662963506827f9b94c6f69dc8d0a7eb3487d795a.zip chromium_src-662963506827f9b94c6f69dc8d0a7eb3487d795a.tar.gz chromium_src-662963506827f9b94c6f69dc8d0a7eb3487d795a.tar.bz2 | |
Fix channel check for fatal error suppression.
Fatal extensions errors should be suppressed on
stable and beta channels of Chrome. This fixes a
regression where they were instead suppressed on
other channels.
BUG=378374
Review URL: https://codereview.chromium.org/306893003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273997 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions/common/extension_api.cc')
| -rw-r--r-- | extensions/common/extension_api.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/extensions/common/extension_api.cc b/extensions/common/extension_api.cc index 9e284f2..698e159 100644 --- a/extensions/common/extension_api.cc +++ b/extensions/common/extension_api.cc @@ -267,7 +267,10 @@ Feature::Availability ExtensionAPI::IsAvailable(const std::string& full_name, Feature::Context context, const GURL& url) { Feature* feature = GetFeatureDependency(full_name); - CHECK(feature) << full_name; + if (!feature) { + return Feature::CreateAvailability(Feature::NOT_PRESENT, + std::string("Unknown feature: ") + full_name); + } return IsAvailable(*feature, extension, context, url); } |