| Index: extensions/common/features/base_feature_provider_unittest.cc
|
| diff --git a/extensions/common/features/base_feature_provider_unittest.cc b/extensions/common/features/base_feature_provider_unittest.cc
|
| index 599a6a6d27b0cd86dd4b245904e32ef9d4c2d055..bdf6327da3ebb5b3ca1bc242f4508860bbad92e2 100644
|
| --- a/extensions/common/features/base_feature_provider_unittest.cc
|
| +++ b/extensions/common/features/base_feature_provider_unittest.cc
|
| @@ -55,26 +55,32 @@ TEST(BaseFeatureProviderTest, ManifestFeatureAvailability) {
|
| ASSERT_TRUE(extension.get());
|
|
|
| Feature* feature = provider->GetFeature("description");
|
| - EXPECT_EQ(Feature::IS_AVAILABLE,
|
| - feature->IsAvailableToContext(extension.get(),
|
| - Feature::UNSPECIFIED_CONTEXT,
|
| - GURL()).result());
|
| + EXPECT_EQ(
|
| + Feature::IS_AVAILABLE,
|
| + feature
|
| + ->IsAvailableToContext(extension.get(), Feature::UNSPECIFIED_CONTEXT,
|
| + Feature::SESSION_TYPE_UNSPECIFIED, GURL())
|
| + .result());
|
|
|
| // This is a generic extension, so an app-only feature isn't allowed.
|
| feature = provider->GetFeature("app.background");
|
| ASSERT_TRUE(feature);
|
| - EXPECT_EQ(Feature::INVALID_TYPE,
|
| - feature->IsAvailableToContext(extension.get(),
|
| - Feature::UNSPECIFIED_CONTEXT,
|
| - GURL()).result());
|
| + EXPECT_EQ(
|
| + Feature::INVALID_TYPE,
|
| + feature
|
| + ->IsAvailableToContext(extension.get(), Feature::UNSPECIFIED_CONTEXT,
|
| + Feature::SESSION_TYPE_UNSPECIFIED, GURL())
|
| + .result());
|
|
|
| // A feature not listed in the manifest isn't allowed.
|
| feature = provider->GetFeature("background");
|
| ASSERT_TRUE(feature);
|
| - EXPECT_EQ(Feature::NOT_PRESENT,
|
| - feature->IsAvailableToContext(extension.get(),
|
| - Feature::UNSPECIFIED_CONTEXT,
|
| - GURL()).result());
|
| + EXPECT_EQ(
|
| + Feature::NOT_PRESENT,
|
| + feature
|
| + ->IsAvailableToContext(extension.get(), Feature::UNSPECIFIED_CONTEXT,
|
| + Feature::SESSION_TYPE_UNSPECIFIED, GURL())
|
| + .result());
|
| }
|
|
|
| // Tests that a real permission feature is available for the correct types of
|
| @@ -124,8 +130,10 @@ TEST(BaseFeatureProviderTest, PermissionFeatureAvailability) {
|
| Feature* feature = provider->GetFeature("power");
|
| EXPECT_EQ(
|
| Feature::IS_AVAILABLE,
|
| - feature->IsAvailableToContext(
|
| - app.get(), Feature::UNSPECIFIED_CONTEXT, GURL()).result());
|
| + feature
|
| + ->IsAvailableToContext(app.get(), Feature::UNSPECIFIED_CONTEXT,
|
| + Feature::SESSION_TYPE_UNSPECIFIED, GURL())
|
| + .result());
|
|
|
| // A permission only available to whitelisted extensions returns availability
|
| // NOT_FOUND_IN_WHITELIST.
|
| @@ -133,16 +141,20 @@ TEST(BaseFeatureProviderTest, PermissionFeatureAvailability) {
|
| ASSERT_TRUE(feature);
|
| EXPECT_EQ(
|
| Feature::NOT_FOUND_IN_WHITELIST,
|
| - feature->IsAvailableToContext(
|
| - app.get(), Feature::UNSPECIFIED_CONTEXT, GURL()).result());
|
| + feature
|
| + ->IsAvailableToContext(app.get(), Feature::UNSPECIFIED_CONTEXT,
|
| + Feature::SESSION_TYPE_UNSPECIFIED, GURL())
|
| + .result());
|
|
|
| // A permission that isn't part of the manifest returns NOT_PRESENT.
|
| feature = provider->GetFeature("serial");
|
| ASSERT_TRUE(feature);
|
| EXPECT_EQ(
|
| Feature::NOT_PRESENT,
|
| - feature->IsAvailableToContext(
|
| - app.get(), Feature::UNSPECIFIED_CONTEXT, GURL()).result());
|
| + feature
|
| + ->IsAvailableToContext(app.get(), Feature::UNSPECIFIED_CONTEXT,
|
| + Feature::SESSION_TYPE_UNSPECIFIED, GURL())
|
| + .result());
|
| }
|
|
|
| } // namespace extensions
|
|
|