Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9198)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/extensions/features/chrome_channel_feature_filter_unittest.cc

Issue 1257633002: Componentize VersionInfo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix lost changes to //chrome/common/BUILD.gn and fix compilation of app_window_intercept_all_keys_u… Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/extensions/features/chrome_channel_feature_filter.cc ('k') | chrome/common/extensions/features/feature_channel.h » ('j') | components/version_info/OWNERS » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/features/chrome_channel_feature_filter_unittest.cc
diff --git a/chrome/common/extensions/features/chrome_channel_feature_filter_unittest.cc b/chrome/common/extensions/features/chrome_channel_feature_filter_unittest.cc
index 771f9d32c3af54afc469f41c48f9cd985a6aa7e0..3b01603f056406fbd7fcf8e6a847c540b0015ec5 100644
--- a/chrome/common/extensions/features/chrome_channel_feature_filter_unittest.cc
+++ b/chrome/common/extensions/features/chrome_channel_feature_filter_unittest.cc
@@ -32,7 +32,7 @@ SimpleFeature* CreateFeature() {
Feature::AvailabilityResult IsAvailableInChannel(
const std::string& channel,
- VersionInfo::Channel channel_for_testing) {
+ version_info::Channel channel_for_testing) {
ScopedCurrentChannel current_channel(channel_for_testing);
SimpleFeature feature;
@@ -55,7 +55,7 @@ Feature::AvailabilityResult IsAvailableInChannel(
class ChromeChannelFeatureFilterTest : public testing::Test {
protected:
ChromeChannelFeatureFilterTest()
- : current_channel_(VersionInfo::CHANNEL_UNKNOWN) {}
+ : current_channel_(version_info::CHANNEL_UNKNOWN) {}
~ChromeChannelFeatureFilterTest() override {}
private:
@@ -69,63 +69,63 @@ class ChromeChannelFeatureFilterTest : public testing::Test {
TEST_F(ChromeChannelFeatureFilterTest, SupportedChannel) {
// stable supported.
EXPECT_EQ(Feature::IS_AVAILABLE,
- IsAvailableInChannel("stable", VersionInfo::CHANNEL_UNKNOWN));
+ IsAvailableInChannel("stable", version_info::CHANNEL_UNKNOWN));
EXPECT_EQ(Feature::IS_AVAILABLE,
- IsAvailableInChannel("stable", VersionInfo::CHANNEL_CANARY));
+ IsAvailableInChannel("stable", version_info::CHANNEL_CANARY));
EXPECT_EQ(Feature::IS_AVAILABLE,
- IsAvailableInChannel("stable", VersionInfo::CHANNEL_DEV));
+ IsAvailableInChannel("stable", version_info::CHANNEL_DEV));
EXPECT_EQ(Feature::IS_AVAILABLE,
- IsAvailableInChannel("stable", VersionInfo::CHANNEL_BETA));
+ IsAvailableInChannel("stable", version_info::CHANNEL_BETA));
EXPECT_EQ(Feature::IS_AVAILABLE,
- IsAvailableInChannel("stable", VersionInfo::CHANNEL_STABLE));
+ IsAvailableInChannel("stable", version_info::CHANNEL_STABLE));
// beta supported.
EXPECT_EQ(Feature::IS_AVAILABLE,
- IsAvailableInChannel("beta", VersionInfo::CHANNEL_UNKNOWN));
+ IsAvailableInChannel("beta", version_info::CHANNEL_UNKNOWN));
EXPECT_EQ(Feature::IS_AVAILABLE,
- IsAvailableInChannel("beta", VersionInfo::CHANNEL_CANARY));
+ IsAvailableInChannel("beta", version_info::CHANNEL_CANARY));
EXPECT_EQ(Feature::IS_AVAILABLE,
- IsAvailableInChannel("beta", VersionInfo::CHANNEL_DEV));
+ IsAvailableInChannel("beta", version_info::CHANNEL_DEV));
EXPECT_EQ(Feature::IS_AVAILABLE,
- IsAvailableInChannel("beta", VersionInfo::CHANNEL_BETA));
+ IsAvailableInChannel("beta", version_info::CHANNEL_BETA));
EXPECT_EQ(Feature::UNSUPPORTED_CHANNEL,
- IsAvailableInChannel("beta", VersionInfo::CHANNEL_STABLE));
+ IsAvailableInChannel("beta", version_info::CHANNEL_STABLE));
// dev supported.
EXPECT_EQ(Feature::IS_AVAILABLE,
- IsAvailableInChannel("dev", VersionInfo::CHANNEL_UNKNOWN));
+ IsAvailableInChannel("dev", version_info::CHANNEL_UNKNOWN));
EXPECT_EQ(Feature::IS_AVAILABLE,
- IsAvailableInChannel("dev", VersionInfo::CHANNEL_CANARY));
+ IsAvailableInChannel("dev", version_info::CHANNEL_CANARY));
EXPECT_EQ(Feature::IS_AVAILABLE,
- IsAvailableInChannel("dev", VersionInfo::CHANNEL_DEV));
+ IsAvailableInChannel("dev", version_info::CHANNEL_DEV));
EXPECT_EQ(Feature::UNSUPPORTED_CHANNEL,
- IsAvailableInChannel("dev", VersionInfo::CHANNEL_BETA));
+ IsAvailableInChannel("dev", version_info::CHANNEL_BETA));
EXPECT_EQ(Feature::UNSUPPORTED_CHANNEL,
- IsAvailableInChannel("dev", VersionInfo::CHANNEL_STABLE));
+ IsAvailableInChannel("dev", version_info::CHANNEL_STABLE));
// canary supported.
EXPECT_EQ(Feature::IS_AVAILABLE,
- IsAvailableInChannel("canary", VersionInfo::CHANNEL_UNKNOWN));
+ IsAvailableInChannel("canary", version_info::CHANNEL_UNKNOWN));
EXPECT_EQ(Feature::IS_AVAILABLE,
- IsAvailableInChannel("canary", VersionInfo::CHANNEL_CANARY));
+ IsAvailableInChannel("canary", version_info::CHANNEL_CANARY));
EXPECT_EQ(Feature::UNSUPPORTED_CHANNEL,
- IsAvailableInChannel("canary", VersionInfo::CHANNEL_DEV));
+ IsAvailableInChannel("canary", version_info::CHANNEL_DEV));
EXPECT_EQ(Feature::UNSUPPORTED_CHANNEL,
- IsAvailableInChannel("canary", VersionInfo::CHANNEL_BETA));
+ IsAvailableInChannel("canary", version_info::CHANNEL_BETA));
EXPECT_EQ(Feature::UNSUPPORTED_CHANNEL,
- IsAvailableInChannel("canary", VersionInfo::CHANNEL_STABLE));
+ IsAvailableInChannel("canary", version_info::CHANNEL_STABLE));
// trunk supported.
EXPECT_EQ(Feature::IS_AVAILABLE,
- IsAvailableInChannel("trunk", VersionInfo::CHANNEL_UNKNOWN));
+ IsAvailableInChannel("trunk", version_info::CHANNEL_UNKNOWN));
EXPECT_EQ(Feature::UNSUPPORTED_CHANNEL,
- IsAvailableInChannel("trunk", VersionInfo::CHANNEL_CANARY));
+ IsAvailableInChannel("trunk", version_info::CHANNEL_CANARY));
EXPECT_EQ(Feature::UNSUPPORTED_CHANNEL,
- IsAvailableInChannel("trunk", VersionInfo::CHANNEL_DEV));
+ IsAvailableInChannel("trunk", version_info::CHANNEL_DEV));
EXPECT_EQ(Feature::UNSUPPORTED_CHANNEL,
- IsAvailableInChannel("trunk", VersionInfo::CHANNEL_BETA));
+ IsAvailableInChannel("trunk", version_info::CHANNEL_BETA));
EXPECT_EQ(Feature::UNSUPPORTED_CHANNEL,
- IsAvailableInChannel("trunk", VersionInfo::CHANNEL_STABLE));
+ IsAvailableInChannel("trunk", version_info::CHANNEL_STABLE));
}
// Tests the validation of features with channel entries.
@@ -195,7 +195,7 @@ TEST_F(ChromeChannelFeatureFilterTest, SimpleFeatureAvailability) {
// Make sure both rules are applied correctly.
{
- ScopedCurrentChannel current_channel(VersionInfo::CHANNEL_BETA);
+ ScopedCurrentChannel current_channel(version_info::CHANNEL_BETA);
EXPECT_EQ(
Feature::IS_AVAILABLE,
feature->IsAvailableToManifest("1",
@@ -210,7 +210,7 @@ TEST_F(ChromeChannelFeatureFilterTest, SimpleFeatureAvailability) {
Feature::UNSPECIFIED_PLATFORM).result());
}
{
- ScopedCurrentChannel current_channel(VersionInfo::CHANNEL_STABLE);
+ ScopedCurrentChannel current_channel(version_info::CHANNEL_STABLE);
EXPECT_NE(
Feature::IS_AVAILABLE,
feature->IsAvailableToManifest("1",
@@ -255,7 +255,7 @@ TEST_F(ChromeChannelFeatureFilterTest, ComplexFeatureAvailability) {
// Test match 1st rule.
{
- ScopedCurrentChannel current_channel(VersionInfo::CHANNEL_UNKNOWN);
+ ScopedCurrentChannel current_channel(version_info::CHANNEL_UNKNOWN);
EXPECT_EQ(
Feature::IS_AVAILABLE,
feature->IsAvailableToManifest("1",
@@ -267,7 +267,7 @@ TEST_F(ChromeChannelFeatureFilterTest, ComplexFeatureAvailability) {
// Test match 2nd rule.
{
- ScopedCurrentChannel current_channel(VersionInfo::CHANNEL_BETA);
+ ScopedCurrentChannel current_channel(version_info::CHANNEL_BETA);
EXPECT_EQ(
Feature::IS_AVAILABLE,
feature->IsAvailableToManifest("2",
@@ -279,7 +279,7 @@ TEST_F(ChromeChannelFeatureFilterTest, ComplexFeatureAvailability) {
// Test feature not available to extensions above channel unknown.
{
- ScopedCurrentChannel current_channel(VersionInfo::CHANNEL_BETA);
+ ScopedCurrentChannel current_channel(version_info::CHANNEL_BETA);
EXPECT_NE(
Feature::IS_AVAILABLE,
feature->IsAvailableToManifest("1",
« no previous file with comments | « chrome/common/extensions/features/chrome_channel_feature_filter.cc ('k') | chrome/common/extensions/features/feature_channel.h » ('j') | components/version_info/OWNERS » ('J')

Powered by Google App Engine
This is Rietveld 408576698