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

chrome/common/extensions/chrome_extensions_client.cc

@@ -272,8 +272,8 @@ void ChromeExtensionsClient::RegisterAPISchemaResources(
 }
 
 bool ChromeExtensionsClient::ShouldSuppressFatalErrors() const {
-  // <= dev means dev, canary, and trunk.
-  return GetCurrentChannel() <= chrome::VersionInfo::CHANNEL_DEV;
+  // Suppress fatal errors only on beta and stable channels.
+  return GetCurrentChannel() > chrome::VersionInfo::CHANNEL_DEV;
 }
 
 // static

chrome/renderer/resources/extensions/last_error.js

@@ -28,7 +28,7 @@ function set(name, message, stack, targetChrome) {
   clear(targetChrome);  // in case somebody has set a sneaky getter/setter
 
   var errorObject = { message: message };
-  if (targetChrome && targetChrome.extension)
+  if (GetAvailability('extension.lastError').is_available)
     targetChrome.extension.lastError = errorObject;
 
   assertRuntimeIsAvailable();
@@ -81,7 +81,7 @@ function clear(targetChrome) {
   if (!targetChrome)
     throw new Error('No target chrome to clear error');
 
-  if (targetChrome && targetChrome.extension)
+  if (GetAvailability('extension.lastError').is_available)
    delete targetChrome.extension.lastError;
 
   assertRuntimeIsAvailable();

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);
 }