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

extensions/common/extensions_client.h

 // 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.
 
 #ifndef EXTENSIONS_COMMON_EXTENSIONS_CLIENT_H_
 #define EXTENSIONS_COMMON_EXTENSIONS_CLIENT_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_piece.h"
 
 class GURL;
 
 namespace extensions {
 
 class APIPermissionSet;
 class Extension;
 class FeatureProvider;
+class JSONFeatureProviderSource;
 class ManifestPermissionSet;
 class PermissionMessage;
 class PermissionMessageProvider;
 class PermissionsProvider;
 class SimpleFeature;
 class URLPatternSet;
 
 // Sets up global state for the extensions system. Should be Set() once in each
 // process. This should be implemented by the client of the extensions system.
 class ExtensionsClient {
  public:
   typedef std::vector<std::string> ScriptingWhitelist;
 
   virtual ~ExtensionsClient() {}
 
   // Initializes global state. Not done in the constructor because unit tests
   // can create additional ExtensionsClients because the utility thread runs
   // in-process.
   virtual void Initialize() = 0;
 
   // Returns the global PermissionMessageProvider to use to provide permission
   // warning strings.
   virtual const PermissionMessageProvider& GetPermissionMessageProvider()
       const = 0;
 
   // Create a FeatureProvider for a specific feature type, e.g. "permission".
   virtual scoped_ptr<FeatureProvider> CreateFeatureProvider(
       const std::string& name) const = 0;
 
+  // Create a JSONFeatureProviderSource for a specific feature type,
+  // e.g. "permission". (There are currently no other sources of features data.)

[James Cook, 2014/05/20 18:15:47]

Doesn't this also work for "api" and "manifest"?  At least the
ShellExtensionsClient works for those.

[Yoyo Zhou, 2014/05/21 01:05:47]

This wording is confusing. I'll fix it.

+  // This is used primarily in CreateFeatureProvider, above.
+  virtual scoped_ptr<JSONFeatureProviderSource> CreateFeatureProviderSource(
+      const std::string& name) const = 0;
+
   // Takes the list of all hosts and filters out those with special
   // permission strings. Adds the regular hosts to |new_hosts|,
   // and adds the special permission messages to |messages|.
   virtual void FilterHostPermissions(
       const URLPatternSet& hosts,
       URLPatternSet* new_hosts,
       std::set<PermissionMessage>* messages) const = 0;
 
   // Replaces the scripting whitelist with |whitelist|. Used in the renderer;
   // only used for testing in the browser process.
@@ skipping 24 matching lines @@
   // Return the extensions client.
   static ExtensionsClient* Get();
 
   // Initialize the extensions system with this extensions client.
   static void Set(ExtensionsClient* client);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_COMMON_EXTENSIONS_CLIENT_H_