Pass user session type to extension feature checks

extensions/common/features/simple_feature_unittest.cc

Index: extensions/common/features/simple_feature_unittest.cc
diff --git a/extensions/common/features/simple_feature_unittest.cc b/extensions/common/features/simple_feature_unittest.cc
index 662cf280e07642859345b1c4a9b2efd89d81ad74..b55ebfc5802be6f9c99603ff6b2326dcb011254b 100644
--- a/extensions/common/features/simple_feature_unittest.cc
+++ b/extensions/common/features/simple_feature_unittest.cc
@@ -334,9 +334,13 @@ TEST_F(SimpleFeatureTest, Context) {
   ASSERT_TRUE(extension.get());
 
   feature.whitelist_.push_back("monkey");
-  EXPECT_EQ(Feature::NOT_FOUND_IN_WHITELIST, feature.IsAvailableToContext(
-      extension.get(), Feature::BLESSED_EXTENSION_CONTEXT,
-      Feature::CHROMEOS_PLATFORM).result());
+  EXPECT_EQ(Feature::NOT_FOUND_IN_WHITELIST,
+            feature
+                .IsAvailableToContext(extension.get(),
+                                      Feature::BLESSED_EXTENSION_CONTEXT,
+                                      Feature::SESSION_TYPE_UNSPECIFIED,
+                                      Feature::CHROMEOS_PLATFORM)
+                .result());
   feature.whitelist_.clear();
 
   feature.extension_types_.clear();
@@ -344,7 +348,7 @@ TEST_F(SimpleFeatureTest, Context) {
   {
     Feature::Availability availability = feature.IsAvailableToContext(
         extension.get(), Feature::BLESSED_EXTENSION_CONTEXT,
-        Feature::CHROMEOS_PLATFORM);
+        Feature::SESSION_TYPE_UNSPECIFIED, Feature::CHROMEOS_PLATFORM);
     EXPECT_EQ(Feature::INVALID_TYPE, availability.result());
     EXPECT_EQ("'somefeature' is only allowed for themes, "
               "but this is a legacy packaged app.",
@@ -359,7 +363,7 @@ TEST_F(SimpleFeatureTest, Context) {
   {
     Feature::Availability availability = feature.IsAvailableToContext(
         extension.get(), Feature::BLESSED_EXTENSION_CONTEXT,
-        Feature::CHROMEOS_PLATFORM);
+        Feature::SESSION_TYPE_UNSPECIFIED, Feature::CHROMEOS_PLATFORM);
     EXPECT_EQ(Feature::INVALID_CONTEXT, availability.result());
     EXPECT_EQ("'somefeature' is only allowed to run in extension iframes and "
               "content scripts, but this is a privileged page",
@@ -370,7 +374,7 @@ TEST_F(SimpleFeatureTest, Context) {
   {
     Feature::Availability availability = feature.IsAvailableToContext(
         extension.get(), Feature::BLESSED_EXTENSION_CONTEXT,
-        Feature::CHROMEOS_PLATFORM);
+        Feature::SESSION_TYPE_UNSPECIFIED, Feature::CHROMEOS_PLATFORM);
     EXPECT_EQ(Feature::INVALID_CONTEXT, availability.result());
     EXPECT_EQ("'somefeature' is only allowed to run in extension iframes, "
               "content scripts, and web pages, but this is a privileged page",
@@ -380,25 +384,41 @@ TEST_F(SimpleFeatureTest, Context) {
   feature.contexts_.clear();
   feature.contexts_.push_back(Feature::BLESSED_EXTENSION_CONTEXT);
   feature.set_location(SimpleFeature::COMPONENT_LOCATION);
-  EXPECT_EQ(Feature::INVALID_LOCATION, feature.IsAvailableToContext(
-      extension.get(), Feature::BLESSED_EXTENSION_CONTEXT,
-      Feature::CHROMEOS_PLATFORM).result());
+  EXPECT_EQ(Feature::INVALID_LOCATION,
+            feature
+                .IsAvailableToContext(extension.get(),
+                                      Feature::BLESSED_EXTENSION_CONTEXT,
+                                      Feature::SESSION_TYPE_UNSPECIFIED,
+                                      Feature::CHROMEOS_PLATFORM)
+                .result());
   feature.set_location(SimpleFeature::UNSPECIFIED_LOCATION);
 
-  EXPECT_EQ(Feature::INVALID_PLATFORM, feature.IsAvailableToContext(
-      extension.get(), Feature::BLESSED_EXTENSION_CONTEXT,
-      Feature::UNSPECIFIED_PLATFORM).result());
+  EXPECT_EQ(Feature::INVALID_PLATFORM,
+            feature
+                .IsAvailableToContext(extension.get(),
+                                      Feature::BLESSED_EXTENSION_CONTEXT,
+                                      Feature::SESSION_TYPE_UNSPECIFIED,
+                                      Feature::UNSPECIFIED_PLATFORM)
+                .result());
 
   feature.set_min_manifest_version(22);
-  EXPECT_EQ(Feature::INVALID_MIN_MANIFEST_VERSION, feature.IsAvailableToContext(
-      extension.get(), Feature::BLESSED_EXTENSION_CONTEXT,
-      Feature::CHROMEOS_PLATFORM).result());
+  EXPECT_EQ(Feature::INVALID_MIN_MANIFEST_VERSION,
+            feature
+                .IsAvailableToContext(extension.get(),
+                                      Feature::BLESSED_EXTENSION_CONTEXT,
+                                      Feature::SESSION_TYPE_UNSPECIFIED,
+                                      Feature::CHROMEOS_PLATFORM)
+                .result());
   feature.set_min_manifest_version(21);
 
   feature.set_max_manifest_version(18);
-  EXPECT_EQ(Feature::INVALID_MAX_MANIFEST_VERSION, feature.IsAvailableToContext(
-      extension.get(), Feature::BLESSED_EXTENSION_CONTEXT,
-      Feature::CHROMEOS_PLATFORM).result());
+  EXPECT_EQ(Feature::INVALID_MAX_MANIFEST_VERSION,
+            feature
+                .IsAvailableToContext(extension.get(),
+                                      Feature::BLESSED_EXTENSION_CONTEXT,
+                                      Feature::SESSION_TYPE_UNSPECIFIED,
+                                      Feature::CHROMEOS_PLATFORM)
+                .result());
   feature.set_max_manifest_version(25);
 }