Clean up TestFeaturesNativeHandler to use the ExtensionsClient's JSON feature sources.

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/api/generated_schemas.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "extensions/common/api/generated_schemas.h"
@@ skipping 11 matching lines @@
 #include "extensions/common/permissions/permissions_provider.h"
 #include "extensions/common/url_pattern_set.h"
 #include "grit/app_shell_resources.h"
 #include "grit/extensions_resources.h"
 
 using extensions::APIPermissionInfo;
 using extensions::APIPermissionSet;
 using extensions::BaseFeatureProvider;
 using extensions::Extension;
 using extensions::FeatureProvider;
+using extensions::JSONFeatureProviderSource;
 using extensions::Manifest;
 using extensions::PermissionMessage;
 using extensions::PermissionMessages;
 using extensions::PermissionSet;
 using extensions::URLPatternSet;
 
 namespace apps {
 
 namespace {
 
@@ skipping 70 matching lines @@
 }
 
 const extensions::PermissionMessageProvider&
 ShellExtensionsClient::GetPermissionMessageProvider() const {
   NOTIMPLEMENTED();
   return g_permission_message_provider.Get();
 }
 
 scoped_ptr<FeatureProvider> ShellExtensionsClient::CreateFeatureProvider(
     const std::string& name) const {
-  extensions::JSONFeatureProviderSource source(name);
+  scoped_ptr<FeatureProvider> provider;
+  scoped_ptr<JSONFeatureProviderSource> source(
+      CreateFeatureProviderSource(name));
   if (name == "api") {
-    source.LoadJSON(IDR_EXTENSION_API_FEATURES);
-    source.LoadJSON(IDR_SHELL_EXTENSION_API_FEATURES);
-    return scoped_ptr<FeatureProvider>(new BaseFeatureProvider(
-        source.dictionary(), CreateFeature<extensions::APIFeature>));
+    provider.reset(new BaseFeatureProvider(
+        source->dictionary(), CreateFeature<extensions::APIFeature>));
   } else if (name == "manifest") {
-    source.LoadJSON(IDR_EXTENSION_MANIFEST_FEATURES);
-    return scoped_ptr<FeatureProvider>(new BaseFeatureProvider(
-        source.dictionary(), CreateFeature<extensions::ManifestFeature>));
+    provider.reset(new BaseFeatureProvider(
+        source->dictionary(), CreateFeature<extensions::ManifestFeature>));
   } else if (name == "permission") {
-    source.LoadJSON(IDR_EXTENSION_PERMISSION_FEATURES);
-    return scoped_ptr<FeatureProvider>(new BaseFeatureProvider(
-        source.dictionary(), CreateFeature<extensions::PermissionFeature>));
+    provider.reset(new BaseFeatureProvider(
+        source->dictionary(), CreateFeature<extensions::PermissionFeature>));
   } else {
     NOTREACHED();
   }
-  return scoped_ptr<FeatureProvider>();
+  return provider.Pass();
+}
+
+scoped_ptr<JSONFeatureProviderSource>
+ShellExtensionsClient::CreateFeatureProviderSource(
+    const std::string& name) const {
+  scoped_ptr<JSONFeatureProviderSource> source(
+      new JSONFeatureProviderSource(name));
+  if (name == "api") {
+    source->LoadJSON(IDR_EXTENSION_API_FEATURES);
+    source->LoadJSON(IDR_SHELL_EXTENSION_API_FEATURES);
+  } else if (name == "manifest") {
+    source->LoadJSON(IDR_EXTENSION_MANIFEST_FEATURES);
+  } else if (name == "permission") {
+    source->LoadJSON(IDR_EXTENSION_PERMISSION_FEATURES);
+  } else {
+    NOTREACHED();
+    source.reset();
+  }
+  return source.Pass();
 }
 
 void ShellExtensionsClient::FilterHostPermissions(
     const URLPatternSet& hosts,
     URLPatternSet* new_hosts,
     std::set<PermissionMessage>* messages) const {
   NOTIMPLEMENTED();
 }
 
 void ShellExtensionsClient::SetScriptingWhitelist(
@@ skipping 35 matching lines @@
   // Schema for chrome.shell APIs.
   if (apps::shell_api::GeneratedSchemas::IsGenerated(name))
     return apps::shell_api::GeneratedSchemas::Get(name);
 
   return extensions::core_api::GeneratedSchemas::Get(name);
 }
 
 bool ShellExtensionsClient::ShouldSuppressFatalErrors() const { return true; }
 
 }  // namespace apps