Added check for behavior feature existense

extensions/common/features/feature_provider.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 "extensions/common/features/feature_provider.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/trace_event/trace_event.h"
 #include "content/public/common/content_switches.h"
 #include "extensions/common/extensions_client.h"
+#include "extensions/common/features/feature.h"
 #include "extensions/common/features/feature_util.h"
 #include "extensions/common/switches.h"
 
 namespace extensions {
 
 namespace {
 
 class Static {
  public:
   FeatureProvider* GetFeatures(const std::string& name) const {
@@ skipping 84 matching lines @@
 const Feature* FeatureProvider::GetManifestFeature(const std::string& name) {
   return GetFeatureFromProviderByName("manifest", name);
 }
 
 // static
 const Feature* FeatureProvider::GetPermissionFeature(const std::string& name) {
   return GetFeatureFromProviderByName("permission", name);
 }
 
 // static
-const Feature* FeatureProvider::GetBehaviorFeature(const std::string& name) {
-  return GetFeatureFromProviderByName("behavior", name);
+bool FeatureProvider::BehaviorFeatureIsAvailable(const std::string& name,
+                                                 const Extension* extension) {
+  const Feature* behavior_feature = GetBehaviorFeatures()->GetFeature(name);
+  return behavior_feature &&
+         behavior_feature->IsAvailableToExtension(extension).is_available();
 }
 
 }  // namespace extensions