| Index: extensions/shell/common/shell_extensions_client.cc
|
| diff --git a/extensions/shell/common/shell_extensions_client.cc b/extensions/shell/common/shell_extensions_client.cc
|
| index 76f5a5835e82b8b5d22135ed9ef827e040ce7c1f..338f31233b25b6ca1fa282a1b34cbfd361b7e3b8 100644
|
| --- a/extensions/shell/common/shell_extensions_client.cc
|
| +++ b/extensions/shell/common/shell_extensions_client.cc
|
| @@ -11,8 +11,8 @@
|
| #include "extensions/common/common_manifest_handlers.h"
|
| #include "extensions/common/extension_urls.h"
|
| #include "extensions/common/features/api_feature.h"
|
| -#include "extensions/common/features/base_feature_provider.h"
|
| #include "extensions/common/features/behavior_feature.h"
|
| +#include "extensions/common/features/json_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"
|
| @@ -102,16 +102,16 @@ std::unique_ptr<FeatureProvider> ShellExtensionsClient::CreateFeatureProvider(
|
| std::unique_ptr<JSONFeatureProviderSource> source(
|
| CreateFeatureProviderSource(name));
|
| if (name == "api") {
|
| - provider.reset(new BaseFeatureProvider(source->dictionary(),
|
| + provider.reset(new JSONFeatureProvider(source->dictionary(),
|
| CreateFeature<APIFeature>));
|
| } else if (name == "manifest") {
|
| - provider.reset(new BaseFeatureProvider(source->dictionary(),
|
| + provider.reset(new JSONFeatureProvider(source->dictionary(),
|
| CreateFeature<ManifestFeature>));
|
| } else if (name == "permission") {
|
| - provider.reset(new BaseFeatureProvider(source->dictionary(),
|
| + provider.reset(new JSONFeatureProvider(source->dictionary(),
|
| CreateFeature<PermissionFeature>));
|
| } else if (name == "behavior") {
|
| - provider.reset(new BaseFeatureProvider(source->dictionary(),
|
| + provider.reset(new JSONFeatureProvider(source->dictionary(),
|
| CreateFeature<BehaviorFeature>));
|
| } else {
|
| NOTREACHED();
|
|
|