Split feature definitions into extensions and chrome features.

extensions/common/features/base_feature_provider.cc

 // Copyright 2014 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/base_feature_provider.h"
 
 #include <stack>
 
-#include "base/json/json_reader.h"
-#include "base/lazy_instance.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "extensions/common/extensions_client.h"
-#include "extensions/common/features/api_feature.h"
 #include "extensions/common/features/complex_feature.h"
-#include "extensions/common/features/manifest_feature.h"
-#include "extensions/common/features/permission_feature.h"
-#include "grit/common_resources.h"
-#include "ui/base/resource/resource_bundle.h"
+#include "extensions/common/features/simple_feature.h"
 
 namespace extensions {
 
 namespace {
 
-template<class FeatureClass>
-SimpleFeature* CreateFeature() {
-  SimpleFeature* feature = new FeatureClass();
-  ExtensionsClient::Get()->AddExtraFeatureFilters(feature);
-  return feature;
-}
-
-static BaseFeatureProvider* LoadProvider(
-      const std::string& name,
-      BaseFeatureProvider::FeatureFactory factory,
-      int resource_id) {
-  const std::string& features_file =
-      ResourceBundle::GetSharedInstance().GetRawDataResource(
-          resource_id).as_string();
-  int error_code = 0;
-  std::string error_message;
-  scoped_ptr<base::Value> value(base::JSONReader::ReadAndReturnError(
-      features_file, base::JSON_PARSE_RFC,
-      &error_code, &error_message));
-  DCHECK(value) << "Could not load features: " << name << " "
-      << error_message;
-  scoped_ptr<base::DictionaryValue> value_as_dict;
-  if (value) {
-    CHECK(value->IsType(base::Value::TYPE_DICTIONARY)) << name;
-    value_as_dict.reset(static_cast<base::DictionaryValue*>(value.release()));
-  } else {
-    // http://crbug.com/176381
-    value_as_dict.reset(new base::DictionaryValue());
-  }
-  return new BaseFeatureProvider(*value_as_dict, factory);
-}
-
-struct Static {
-  Static() {
-    feature_providers["api"] = make_linked_ptr(
-        LoadProvider("api",
-                     &CreateFeature<APIFeature>,
-                     IDR_EXTENSION_API_FEATURES));
-    feature_providers["permission"] = make_linked_ptr(
-        LoadProvider("permission",
-                     &CreateFeature<PermissionFeature>,
-                     IDR_EXTENSION_PERMISSION_FEATURES));
-    feature_providers["manifest"] = make_linked_ptr(
-        LoadProvider("manifest",
-                     &CreateFeature<ManifestFeature>,
-                     IDR_EXTENSION_MANIFEST_FEATURES));
-  }
-
-  typedef std::map<std::string, linked_ptr<FeatureProvider> >
-      FeatureProviderMap;
-
-  FeatureProvider* GetFeatures(const std::string& name) const {
-    FeatureProviderMap::const_iterator it = feature_providers.find(name);
-    CHECK(it != feature_providers.end());
-    return it->second.get();
-  }
-
-  FeatureProviderMap feature_providers;
-};
-
-base::LazyInstance<Static> g_static = LAZY_INSTANCE_INITIALIZER;
-
 bool ParseFeature(const base::DictionaryValue* value,
                   const std::string& name,
                   SimpleFeature* feature) {
   feature->set_name(name);
   std::string error = feature->Parse(value);
   if (!error.empty())
     LOG(ERROR) << error;
   return error.empty();
 }
 
 }  // namespace
 
 BaseFeatureProvider::BaseFeatureProvider(const base::DictionaryValue& root,
                                          FeatureFactory factory)
-    : factory_(factory ? factory :
-               static_cast<FeatureFactory>(&CreateFeature<SimpleFeature>)) {
+    : factory_(factory) {
   for (base::DictionaryValue::Iterator iter(root); !iter.IsAtEnd();
        iter.Advance()) {
     if (iter.value().GetType() == base::Value::TYPE_DICTIONARY) {
       linked_ptr<SimpleFeature> feature((*factory_)());
 
       std::vector<std::string> split;
       base::SplitString(iter.key(), '.', &split);
 
       // Push parent features on the stack, starting with the current feature.
       // If one of the features has "noparent" set, stop pushing features on
@@ skipping 65 matching lines @@
     } else {
       LOG(ERROR) << iter.key() << ": Feature description must be dictionary or"
                  << " list of dictionaries.";
     }
   }
 }
 
 BaseFeatureProvider::~BaseFeatureProvider() {
 }
 
-// static
-FeatureProvider* BaseFeatureProvider::GetByName(
-    const std::string& name) {
-  return g_static.Get().GetFeatures(name);
-}
-
 const std::vector<std::string>& BaseFeatureProvider::GetAllFeatureNames()
     const {
   if (feature_names_.empty()) {
     for (FeatureMap::const_iterator iter = features_.begin();
          iter != features_.end(); ++iter) {
       feature_names_.push_back(iter->first);
     }
     // A std::map is sorted by its keys, so we don't need to sort feature_names_
     // now.
   }
@@ skipping 36 matching lines @@
   std::vector<Feature*> result;
   result.reserve(std::distance(first_child, after_children));
   for (FeatureMap::const_iterator it = first_child; it != after_children;
        ++it) {
     result.push_back(it->second.get());
   }
   return result;
 }
 
 } // namespace extensions