| Index: chrome/common/extensions/features/base_feature_provider_unittest.cc
 | 
| diff --git a/chrome/common/extensions/features/base_feature_provider_unittest.cc b/chrome/common/extensions/features/base_feature_provider_unittest.cc
 | 
| index 17284f9fc13806104ab0595b9ed296650482769a..df876dc88c308106d9fd77d668e180aba12f118d 100644
 | 
| --- a/chrome/common/extensions/features/base_feature_provider_unittest.cc
 | 
| +++ b/chrome/common/extensions/features/base_feature_provider_unittest.cc
 | 
| @@ -4,6 +4,7 @@
 | 
|  
 | 
|  #include "chrome/common/extensions/features/base_feature_provider.h"
 | 
|  
 | 
| +#include "chrome/common/extensions/features/permission_feature.h"
 | 
|  #include "chrome/common/extensions/value_builder.h"
 | 
|  #include "testing/gtest/include/gtest/gtest.h"
 | 
|  
 | 
| @@ -14,6 +15,7 @@ using extensions::Extension;
 | 
|  using extensions::Feature;
 | 
|  using extensions::ListBuilder;
 | 
|  using extensions::Manifest;
 | 
| +using extensions::PermissionFeature;
 | 
|  using extensions::SimpleFeature;
 | 
|  
 | 
|  TEST(BaseFeatureProvider, ManifestFeatures) {
 | 
| @@ -100,6 +102,10 @@ TEST(BaseFeatureProvider, PermissionFeatures) {
 | 
|        extension.get(), Feature::UNSPECIFIED_CONTEXT).result());
 | 
|  }
 | 
|  
 | 
| +SimpleFeature* CreatePermissionFeature() {
 | 
| +  return new PermissionFeature();
 | 
| +}
 | 
| +
 | 
|  TEST(BaseFeatureProvider, Validation) {
 | 
|    scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue());
 | 
|  
 | 
| @@ -116,14 +122,14 @@ TEST(BaseFeatureProvider, Validation) {
 | 
|    value->Set("feature2", feature2);
 | 
|  
 | 
|    scoped_ptr<BaseFeatureProvider> provider(
 | 
| -      new BaseFeatureProvider(*value, NULL));
 | 
| +      new BaseFeatureProvider(*value, CreatePermissionFeature));
 | 
|  
 | 
|    // feature1 won't validate because it lacks an extension type.
 | 
|    EXPECT_FALSE(provider->GetFeature("feature1"));
 | 
|  
 | 
|    // If we add one, it works.
 | 
|    feature1->Set("extension_types", extension_types->DeepCopy());
 | 
| -  provider.reset(new BaseFeatureProvider(*value, NULL));
 | 
| +  provider.reset(new BaseFeatureProvider(*value, CreatePermissionFeature));
 | 
|    EXPECT_TRUE(provider->GetFeature("feature1"));
 | 
|  
 | 
|    // feature2 won't validate because of the presence of "contexts".
 | 
| @@ -131,7 +137,7 @@ TEST(BaseFeatureProvider, Validation) {
 | 
|  
 | 
|    // If we remove it, it works.
 | 
|    feature2->Remove("contexts", NULL);
 | 
| -  provider.reset(new BaseFeatureProvider(*value, NULL));
 | 
| +  provider.reset(new BaseFeatureProvider(*value, CreatePermissionFeature));
 | 
|    EXPECT_TRUE(provider->GetFeature("feature2"));
 | 
|  }
 | 
|  
 | 
| 
 |