Introduce session type parameter to extension features

chrome/common/extensions/api/common_extension_api_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/common/extension_api.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <string>
@@ skipping 173 matching lines @@
        Feature::SESSION_TYPE_UNSPECIFIED, GURL()},
       {"parent3", true, Feature::CONTENT_SCRIPT_CONTEXT,
        Feature::SESSION_TYPE_UNSPECIFIED, GURL()},
       {"parent3", false, Feature::BLESSED_EXTENSION_CONTEXT,
        Feature::SESSION_TYPE_UNSPECIFIED, GURL()},
       {"parent3", false, Feature::UNBLESSED_EXTENSION_CONTEXT,
        Feature::SESSION_TYPE_UNSPECIFIED, GURL()},
       {"parent3.noparent", true, Feature::CONTENT_SCRIPT_CONTEXT,
        Feature::SESSION_TYPE_UNSPECIFIED, GURL()},
       {"parent3.noparent", true, Feature::BLESSED_EXTENSION_CONTEXT,
        Feature::SESSION_TYPE_UNSPECIFIED, GURL()},

[Devlin, 2016/08/17 16:51:07]

Does this CL need to be rebased?  This seems different from master.

       {"parent3.noparent", true, Feature::UNBLESSED_EXTENSION_CONTEXT,
        Feature::SESSION_TYPE_UNSPECIFIED, GURL()},
       {"parent3.noparent.child", true, Feature::CONTENT_SCRIPT_CONTEXT,
        Feature::SESSION_TYPE_UNSPECIFIED, GURL()},
       {"parent3.noparent.child", true, Feature::BLESSED_EXTENSION_CONTEXT,
        Feature::SESSION_TYPE_UNSPECIFIED, GURL()},
       {"parent3.noparent.child", true, Feature::UNBLESSED_EXTENSION_CONTEXT,
        Feature::SESSION_TYPE_UNSPECIFIED, GURL()},
-  };
+
+      // Session types.
+      {"kiosk_only", true, Feature::BLESSED_EXTENSION_CONTEXT,
+       Feature::SESSION_TYPE_KIOSK, GURL()},
+      {"kiosk_only", false, Feature::BLESSED_EXTENSION_CONTEXT,
+       Feature::SESSION_TYPE_REGULAR, GURL()},
+      {"kiosk_only", false, Feature::BLESSED_EXTENSION_CONTEXT,
+       Feature::SESSION_TYPE_UNSPECIFIED, GURL()},
+      {"non_kiosk", false, Feature::BLESSED_EXTENSION_CONTEXT,
+       Feature::SESSION_TYPE_KIOSK, GURL()},
+      {"non_kiosk", true, Feature::BLESSED_EXTENSION_CONTEXT,
+       Feature::SESSION_TYPE_REGULAR, GURL()},
+      {"non_kiosk", false, Feature::BLESSED_EXTENSION_CONTEXT,
+       Feature::SESSION_TYPE_UNSPECIFIED, GURL()}};
 
   base::FilePath api_features_path;
   PathService::Get(chrome::DIR_TEST_DATA, &api_features_path);
   api_features_path = api_features_path.AppendASCII("extensions")
       .AppendASCII("extension_api_unittest")
       .AppendASCII("api_features.json");
 
   std::string api_features_str;
   ASSERT_TRUE(base::ReadFileToString(
       api_features_path, &api_features_str)) << "api_features.json";
@@ skipping 80 matching lines @@
        Feature::SESSION_TYPE_UNSPECIFIED, NULL, GURL()},
       {"test3", true, Feature::WEB_PAGE_CONTEXT,
        Feature::SESSION_TYPE_UNSPECIFIED, NULL, GURL("http://foo.com")},
       {"test4.foo", true, Feature::CONTENT_SCRIPT_CONTEXT,
        Feature::SESSION_TYPE_UNSPECIFIED, NULL, GURL()},
       {"test7", false, Feature::WEB_PAGE_CONTEXT,
        Feature::SESSION_TYPE_UNSPECIFIED, NULL, GURL("http://google.com")},
       {"test7", true, Feature::WEB_PAGE_CONTEXT,
        Feature::SESSION_TYPE_UNSPECIFIED, NULL, GURL("http://foo.com")},
       {"test7", false, Feature::WEB_PAGE_CONTEXT,
-       Feature::SESSION_TYPE_UNSPECIFIED, NULL, GURL("http://bar.com")}};
+       Feature::SESSION_TYPE_UNSPECIFIED, NULL, GURL("http://bar.com")},
+      {"kiosk_only", true, Feature::BLESSED_EXTENSION_CONTEXT,
+       Feature::SESSION_TYPE_KIOSK, extension.get(), GURL()},
+      {"kiosk_only", false, Feature::BLESSED_EXTENSION_CONTEXT,
+       Feature::SESSION_TYPE_REGULAR, extension.get(), GURL()},
+      {"non_kiosk", false, Feature::BLESSED_EXTENSION_CONTEXT,
+       Feature::SESSION_TYPE_KIOSK, extension.get(), GURL()},
+      {"non_kiosk", true, Feature::BLESSED_EXTENSION_CONTEXT,
+       Feature::SESSION_TYPE_REGULAR, extension.get(), GURL()},
+
+  };
 
   base::FilePath api_features_path;
   PathService::Get(chrome::DIR_TEST_DATA, &api_features_path);
   api_features_path = api_features_path.AppendASCII("extensions")
       .AppendASCII("extension_api_unittest")
       .AppendASCII("api_features.json");
 
   std::string api_features_str;
   ASSERT_TRUE(base::ReadFileToString(
       api_features_path, &api_features_str)) << "api_features.json";
@@ skipping 570 matching lines @@
                                 Feature::SESSION_TYPE_UNSPECIFIED, GURL())
                   .is_available());
   EXPECT_FALSE(extension_api
                    ->IsAvailable("pageAction", extension.get(),
                                  Feature::BLESSED_EXTENSION_CONTEXT,
                                  Feature::SESSION_TYPE_UNSPECIFIED, GURL())
                    .is_available());
 }
 
 }  // namespace extensions