| Index: chrome/common/extensions/chrome_extensions_client.cc
|
| diff --git a/chrome/common/extensions/chrome_extensions_client.cc b/chrome/common/extensions/chrome_extensions_client.cc
|
| index d83395475bf6118811f320bda222854a4332872b..5d3b71712eef5854dbc895ccf769987220ad8e78 100644
|
| --- a/chrome/common/extensions/chrome_extensions_client.cc
|
| +++ b/chrome/common/extensions/chrome_extensions_client.cc
|
| @@ -34,9 +34,9 @@
|
| #include "extensions/common/extension_icon_set.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/feature_provider.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"
|
| @@ -147,16 +147,16 @@ std::unique_ptr<FeatureProvider> ChromeExtensionsClient::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();
|
|
|