Properly propagate the current Chrome channel into the Feature system on the

chrome/common/extensions/features/feature_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 "chrome/common/extensions/features/feature.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 using chrome::VersionInfo;
 using extensions::Extension;
@@ skipping 436 matching lines @@
   feature2.set_min_manifest_version(0);
   EXPECT_FALSE(feature2.Equals(feature));
 
   feature2 = feature;
   feature2.set_max_manifest_version(0);
   EXPECT_FALSE(feature2.Equals(feature));
 }
 
 Feature::Availability IsAvailableInChannel(
     const std::string& channel, VersionInfo::Channel channel_for_testing) {
-  Feature::SetChannelCheckingEnabled(true);
-  Feature::SetChannelForTesting(channel_for_testing);
+  Feature::ScopedCurrentChannel current_channel(channel_for_testing);
 
   Feature feature;
   if (!channel.empty()) {
     DictionaryValue feature_value;
     feature_value.SetString("channel", channel);
     feature.Parse(&feature_value);
   }
 
-  Feature::Availability availability = feature.IsAvailableToManifest(
+  return feature.IsAvailableToManifest(
       "random-extension",
       Extension::TYPE_UNKNOWN,
       Feature::UNSPECIFIED_LOCATION,
       -1);
-
-  Feature::ResetChannelForTesting();
-  Feature::ResetChannelCheckingEnabled();
-  return availability;
 }
 
 TEST(ExtensionFeatureTest, SupportedChannel) {
   // stable supported.
   EXPECT_EQ(Feature::IS_AVAILABLE,
       IsAvailableInChannel("stable", VersionInfo::CHANNEL_UNKNOWN));
   EXPECT_EQ(Feature::IS_AVAILABLE,
       IsAvailableInChannel("stable", VersionInfo::CHANNEL_CANARY));
   EXPECT_EQ(Feature::IS_AVAILABLE,
       IsAvailableInChannel("stable", VersionInfo::CHANNEL_DEV));
@@ skipping 57 matching lines @@
       IsAvailableInChannel("", VersionInfo::CHANNEL_CANARY));
   EXPECT_EQ(Feature::UNSUPPORTED_CHANNEL,
       IsAvailableInChannel("", VersionInfo::CHANNEL_DEV));
   EXPECT_EQ(Feature::UNSUPPORTED_CHANNEL,
       IsAvailableInChannel("", VersionInfo::CHANNEL_BETA));
   EXPECT_EQ(Feature::UNSUPPORTED_CHANNEL,
       IsAvailableInChannel("", VersionInfo::CHANNEL_STABLE));
 }
 
 }  // namespace