Introduce session type parameter to extension features

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..7c51b9aca65a32e504e5117a81b43edc85fbb60d 100644
--- a/extensions/common/features/simple_feature_unittest.cc
+++ b/extensions/common/features/simple_feature_unittest.cc
@@ -7,6 +7,7 @@
 #include <stddef.h>
 
 #include <string>
+#include <vector>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ -16,6 +17,7 @@
 #include "extensions/common/features/api_feature.h"
 #include "extensions/common/features/complex_feature.h"
 #include "extensions/common/features/feature_channel.h"
+#include "extensions/common/features/feature_session_type.h"
 #include "extensions/common/features/json_feature_provider.h"
 #include "extensions/common/features/permission_feature.h"
 #include "extensions/common/manifest.h"
@@ -35,6 +37,14 @@ struct IsAvailableTestData {
   Feature::AvailabilityResult expected_result;
 };
 
+struct FeatureSessionTypeTestData {
+  std::string desc;
+  Feature::AvailabilityResult expected_availability;
+  FeatureSessionType current_session_type;
+  std::initializer_list<FeatureSessionType> feature_session_types;
+  bool ignore_session_types;

[Devlin, 2016/08/23 20:49:06]

Why do we need this?  It seems like we should never be ignoring session types.

[tbarzic, 2016/09/08 18:48:55]

it was named a bit poorly, but it's used to distinguish empty session_types and
unset session_types when setting up test, not needed any more since
empty_session type is not a valid value, and essentially gets ignored.

+};
+
 template <class FeatureClass>
 SimpleFeature* CreateFeature() {
   return new FeatureClass();
@@ -402,6 +412,141 @@ TEST_F(SimpleFeatureTest, Context) {
   feature.set_max_manifest_version(25);
 }
 
+TEST_F(SimpleFeatureTest, SessionType) {
+  base::DictionaryValue manifest;
+  manifest.SetString("name", "test");
+  manifest.SetString("version", "1");
+  manifest.SetInteger("manifest_version", 21);

[Devlin, 2016/08/23 20:49:06]

?  This didn't throw an error?

[tbarzic, 2016/09/08 18:48:55]

no

+  manifest.SetString("app.launch.local_path", "foo.html");
+
+  std::string error;
+  scoped_refptr<const Extension> extension(
+      Extension::Create(base::FilePath(), Manifest::INTERNAL, manifest,
+                        Extension::NO_FLAGS, &error));
+  EXPECT_EQ("", error);
+  ASSERT_TRUE(extension.get());
+
+  const std::vector<FeatureSessionTypeTestData> kTestData(
+      {{"kiosk_feature in kiosk session",
+        Feature::IS_AVAILABLE,
+        FeatureSessionType::KIOSK,
+        {FeatureSessionType::KIOSK},
+        false /* ignore_session_types */},
+       {"kiosk feature in regular session",
+        Feature::INVALID_SESSION_TYPE,
+        FeatureSessionType::REGULAR,
+        {FeatureSessionType::KIOSK},
+        false /* ignore_session_types */},
+       {"kiosk feature in unknown session",
+        Feature::INVALID_SESSION_TYPE,
+        FeatureSessionType::UNKNOWN,
+        {FeatureSessionType::KIOSK},
+        false /* ignore_session_types */},
+       {"kiosk feature in initial session",
+        Feature::INVALID_SESSION_TYPE,
+        FeatureSessionType::INITIAL,
+        {FeatureSessionType::KIOSK},
+        false /* ignore_session_types */},
+       {"non kiosk feature in kiosk session",
+        Feature::INVALID_SESSION_TYPE,
+        FeatureSessionType::KIOSK,
+        {FeatureSessionType::REGULAR},
+        false /* ignore_session_types */},
+       {"non kiosk feature in regular session",
+        Feature::IS_AVAILABLE,
+        FeatureSessionType::REGULAR,
+        {FeatureSessionType::REGULAR},
+        false /* ignore_session_types */},
+       {"non kiosk feature in unknown session",
+        Feature::INVALID_SESSION_TYPE,
+        FeatureSessionType::UNKNOWN,
+        {FeatureSessionType::REGULAR},
+        false /* ignore_session_types */},
+       {"non kiosk feature in initial session",
+        Feature::INVALID_SESSION_TYPE,
+        FeatureSessionType::INITIAL,
+        {FeatureSessionType::REGULAR},
+        false /* ignore_session_types */},
+
+       {"empty session types in kiosk session",
+        Feature::INVALID_SESSION_TYPE,
+        FeatureSessionType::KIOSK,
+        {},
+        false /* ignore_session_types */},
+       {"empty session types in regular session",
+        Feature::INVALID_SESSION_TYPE,
+        FeatureSessionType::REGULAR,
+        {},
+        false /* ignore_session_types */},
+       {"empty session types in unknown session",
+        Feature::INVALID_SESSION_TYPE,
+        FeatureSessionType::UNKNOWN,
+        {},
+        false /* ignore_session_types */},
+       {"empty session types in unknown session",
+        Feature::INVALID_SESSION_TYPE,
+        FeatureSessionType::INITIAL,
+        {},
+        false /* ignore_session_types */},
+
+       {"session agnostic feature in kiosk session",
+        Feature::IS_AVAILABLE,
+        FeatureSessionType::KIOSK,
+        {},
+        true /* ignore_session_types */},
+       {"session agnostic feature in regular session",
+        Feature::IS_AVAILABLE,
+        FeatureSessionType::REGULAR,
+        {},
+        true /* ignore_session_types */},
+       {"session agnostic feature in unknown session",
+        Feature::IS_AVAILABLE,
+        FeatureSessionType::UNKNOWN,
+        {},
+        true /* ignore_session_types */},
+       {"feature with multiple session types",
+        Feature::IS_AVAILABLE,
+        FeatureSessionType::REGULAR,
+        {FeatureSessionType::REGULAR, FeatureSessionType::KIOSK},
+        false /* ignore_session_types */},
+       {"feature with multiple session types in unknown session",
+        Feature::INVALID_SESSION_TYPE,
+        FeatureSessionType::UNKNOWN,
+        {FeatureSessionType::REGULAR, FeatureSessionType::KIOSK},
+        false /* ignore_session_types */},
+       {"feature with multiple session types in initial session",
+        Feature::INVALID_SESSION_TYPE,
+        FeatureSessionType::INITIAL,
+        {FeatureSessionType::REGULAR, FeatureSessionType::KIOSK},
+        false /* ignore_session_types */}});
+
+  for (const auto& test : kTestData) {
+    std::unique_ptr<base::AutoReset<FeatureSessionType>> current_session(
+        ScopedCurrentFeatureSessionType(test.current_session_type));
+
+    SimpleFeature feature;
+    if (!test.ignore_session_types)
+      feature.set_session_types(test.feature_session_types);
+
+    EXPECT_EQ(test.expected_availability,
+              feature
+                  .IsAvailableToContext(extension.get(),
+                                        Feature::BLESSED_EXTENSION_CONTEXT,
+                                        Feature::CHROMEOS_PLATFORM)
+                  .result())
+        << "Failed test '" << test.desc << "'.";
+
+    EXPECT_EQ(
+        test.expected_availability,
+        feature
+            .IsAvailableToManifest(extension->id(), Manifest::TYPE_UNKNOWN,
+                                   Manifest::INVALID_LOCATION, -1,
+                                   Feature::CHROMEOS_PLATFORM)
+            .result())
+        << "Failed test '" << test.desc << "'.";
+  }
+}
+
 TEST_F(SimpleFeatureTest, Location) {
   // Component extensions can access any location.
   EXPECT_TRUE(LocationIsAvailable(SimpleFeature::COMPONENT_LOCATION,