Move channel-related (Chrome-specific) global state out of Feature.

chrome/common/extensions/features/simple_feature_unittest.cc

Index: chrome/common/extensions/features/simple_feature_unittest.cc
diff --git a/chrome/common/extensions/features/simple_feature_unittest.cc b/chrome/common/extensions/features/simple_feature_unittest.cc
index b50ddb25b3aad9e5bf415ac331114d79915e7034..fc7967fa4bef8eeb367f398386b7e9d9f6015f42 100644
--- a/chrome/common/extensions/features/simple_feature_unittest.cc
+++ b/chrome/common/extensions/features/simple_feature_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/common/extensions/features/simple_feature.h"
 
+#include "chrome/common/extensions/features/feature_channel.h"
 #include "chrome/common/extensions/value_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -13,6 +14,7 @@ using extensions::Extension;
 using extensions::Feature;
 using extensions::ListBuilder;
 using extensions::Manifest;
+using extensions::ScopedCurrentChannel;
 using extensions::SimpleFeature;
 
 namespace {
@@ -33,7 +35,7 @@ class ExtensionSimpleFeatureTest : public testing::Test {
   virtual ~ExtensionSimpleFeatureTest() {}
 
  private:
-  Feature::ScopedCurrentChannel current_channel_;
+  ScopedCurrentChannel current_channel_;
 };
 
 TEST_F(ExtensionSimpleFeatureTest, IsAvailableNullCase) {
@@ -534,7 +536,7 @@ TEST_F(ExtensionSimpleFeatureTest, Equals) {
 
 Feature::AvailabilityResult IsAvailableInChannel(
     const std::string& channel, VersionInfo::Channel channel_for_testing) {
-  Feature::ScopedCurrentChannel current_channel(channel_for_testing);
+  ScopedCurrentChannel current_channel(channel_for_testing);
 
   SimpleFeature feature;
   if (!channel.empty()) {