Split feature definitions into extensions and chrome features.

apps/shell/common/shell_extensions_client.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 "apps/shell/common/shell_extensions_client.h"
 
 #include "apps/shell/common/shell_app_runtime.h"
 #include "base/logging.h"
 #include "chrome/common/extensions/api/generated_schemas.h"
 #include "chrome/common/extensions/permissions/chrome_api_permissions.h"
 #include "extensions/common/api/generated_schemas.h"
 #include "extensions/common/api/sockets/sockets_manifest_handler.h"
 #include "extensions/common/common_manifest_handlers.h"
+#include "extensions/common/features/api_feature.h"
 #include "extensions/common/features/base_feature_provider.h"
+#include "extensions/common/features/json_feature_provider_source.h"
+#include "extensions/common/features/manifest_feature.h"
+#include "extensions/common/features/permission_feature.h"
+#include "extensions/common/features/simple_feature.h"
 #include "extensions/common/manifest_handler.h"
 #include "extensions/common/permissions/permission_message_provider.h"
 #include "extensions/common/permissions/permissions_provider.h"
 #include "extensions/common/url_pattern_set.h"
+#include "grit/common_resources.h"
+#include "grit/extensions_resources.h"
 
 using extensions::APIPermissionInfo;
 using extensions::APIPermissionSet;
+using extensions::BaseFeatureProvider;
 using extensions::Extension;
 using extensions::Manifest;
 using extensions::PermissionMessage;
 using extensions::PermissionMessages;
 using extensions::PermissionSet;
 using extensions::URLPatternSet;
 
 namespace apps {
 
 namespace {
 
+template <class FeatureClass>
+extensions::SimpleFeature* CreateFeature() {
+  return new FeatureClass;
+}
+
 // TODO(jamescook): Refactor ChromePermissionsMessageProvider so we can share
 // code.
 class ShellPermissionMessageProvider
     : public extensions::PermissionMessageProvider {
  public:
   ShellPermissionMessageProvider() {}
   virtual ~ShellPermissionMessageProvider() {}
 
   // PermissionMessageProvider implementation.
   virtual PermissionMessages GetPermissionMessages(
@@ skipping 64 matching lines @@
   return provider;
 }
 
 const extensions::PermissionMessageProvider&
 ShellExtensionsClient::GetPermissionMessageProvider() const {
   NOTIMPLEMENTED();
   static ShellPermissionMessageProvider provider;
   return provider;
 }
 
-extensions::FeatureProvider* ShellExtensionsClient::GetFeatureProviderByName(
+extensions::FeatureProvider* ShellExtensionsClient::CreateFeatureProvider(

[not at google - send to devlin, 2014/04/22 21:39:09]

scoped_ptr<>  ?

[Yoyo Zhou, 2014/04/22 23:17:40]

I think this is silly because it gets immediately turned into linked_ptr. But
done.

[not at google - send to devlin, 2014/04/23 01:22:32]

make_linked_ptr should accept a scoped_ptr rvalue.

[Yoyo Zhou, 2014/04/24 16:34:50]

Nope

     const std::string& name) const {
-  // TODO(jamescook): Factor out an extensions module feature provider.
-  return extensions::BaseFeatureProvider::GetByName(name);
+  extensions::JSONFeatureProviderSource source(name);
+  if (name == "api") {
+    // TODO(yoz): Only include src/extensions resources.
+    source.LoadJSON(IDR_EXTENSION_API_FEATURES);
+    source.LoadJSON(IDR_CHROME_EXTENSION_API_FEATURES);
+    return new BaseFeatureProvider(source.dictionary(),
+                                   &CreateFeature<extensions::APIFeature>);
+  } else if (name == "manifest") {
+    source.LoadJSON(IDR_EXTENSION_MANIFEST_FEATURES);
+    source.LoadJSON(IDR_CHROME_EXTENSION_MANIFEST_FEATURES);
+    return new BaseFeatureProvider(source.dictionary(),
+                                   &CreateFeature<extensions::ManifestFeature>);
+  } else if (name == "permission") {
+    source.LoadJSON(IDR_EXTENSION_PERMISSION_FEATURES);
+    source.LoadJSON(IDR_CHROME_EXTENSION_PERMISSION_FEATURES);
+    return new BaseFeatureProvider(
+        source.dictionary(), &CreateFeature<extensions::PermissionFeature>);
+  } else {
+    NOTREACHED();
+  }
+  return NULL;
 }
 
 void ShellExtensionsClient::FilterHostPermissions(
     const URLPatternSet& hosts,
     URLPatternSet* new_hosts,
     std::set<PermissionMessage>* messages) const {
   NOTIMPLEMENTED();
 }
 
 void ShellExtensionsClient::SetScriptingWhitelist(
@@ skipping 38 matching lines @@
   if (extensions::api::GeneratedSchemas::IsGenerated(name))
     return extensions::api::GeneratedSchemas::Get(name);
 
   // Special-case our simplified app.runtime implementation.
   if (name == extensions::ShellAppRuntime::GetName())
     return extensions::ShellAppRuntime::GetSchema();
 
   return extensions::core_api::GeneratedSchemas::Get(name);
 }
 
-void ShellExtensionsClient::AddExtraFeatureFilters(
-    extensions::SimpleFeature* feature) const {}
-
 bool ShellExtensionsClient::ShouldSuppressFatalErrors() const { return true; }
 
 }  // namespace apps