Added check for behavior feature existense

chrome/browser/extensions/extension_util.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 "chrome/browser/extensions/extension_util.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/values.h"
@@ skipping 37 matching lines @@
 // all urls without explicit permission.
 const char kExtensionAllowedOnAllUrlsPrefName[] =
     "extension_can_script_all_urls";
 
 // The entry into the prefs for when a user has explicitly set the "extension
 // allowed on all urls" pref.
 const char kHasSetScriptOnAllUrlsPrefName[] = "has_set_script_all_urls";
 
 // Returns true if |extension| should always be enabled in incognito mode.
 bool IsWhitelistedForIncognito(const Extension* extension) {
-  return FeatureProvider::GetBehaviorFeature(
-             BehaviorFeature::kWhitelistedForIncognito)
-      ->IsAvailableToExtension(extension)
-      .is_available();
+  return FeatureProvider::BehaviorFeatureIsAvailable(
+             BehaviorFeature::kWhitelistedForIncognito, extension);
 }
 
 // Returns |extension_id|. See note below.
 std::string ReloadExtensionIfEnabled(const std::string& extension_id,
                                      content::BrowserContext* context) {
   ExtensionRegistry* registry = ExtensionRegistry::Get(context);
   bool extension_is_enabled =
       registry->enabled_extensions().Contains(extension_id);
 
   if (!extension_is_enabled)
@@ skipping 316 matching lines @@
   base::FieldTrialList::FindFullName(
       kSupervisedUserExtensionPermissionIncreaseFieldTrialName);
   std::string value = variations::GetVariationParamValue(
       kSupervisedUserExtensionPermissionIncreaseFieldTrialName,
       profile->IsChild() ? "child_account" : "legacy_supervised_user");
   return value == "true";
 }
 
 }  // namespace util
 }  // namespace extensions