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

chrome/common/extensions/features/base_feature_provider_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/base_feature_provider.h"
 
+#include "chrome/common/extensions/features/feature_channel.h"
 #include "chrome/common/extensions/features/permission_feature.h"
 #include "chrome/common/extensions/value_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using chrome::VersionInfo;
 
 namespace extensions {
 
 TEST(BaseFeatureProviderTest, ManifestFeatures) {
   FeatureProvider* provider = BaseFeatureProvider::GetByName("manifest");
@@ skipping 140 matching lines @@
       .Build());
 
   scoped_ptr<BaseFeatureProvider> provider(
       new BaseFeatureProvider(*rule, NULL));
 
   Feature* feature = provider->GetFeature("feature1");
   EXPECT_TRUE(feature);
 
   // Make sure both rules are applied correctly.
   {
-    Feature::ScopedCurrentChannel current_channel(VersionInfo::CHANNEL_BETA);
+    ScopedCurrentChannel current_channel(VersionInfo::CHANNEL_BETA);
     EXPECT_EQ(Feature::IS_AVAILABLE, feature->IsAvailableToManifest(
         "1",
         Manifest::TYPE_EXTENSION,
         Feature::UNSPECIFIED_LOCATION,
         Feature::UNSPECIFIED_PLATFORM).result());
     EXPECT_EQ(Feature::IS_AVAILABLE, feature->IsAvailableToManifest(
         "2",
         Manifest::TYPE_LEGACY_PACKAGED_APP,
         Feature::UNSPECIFIED_LOCATION,
         Feature::UNSPECIFIED_PLATFORM).result());
   }
   {
-    Feature::ScopedCurrentChannel current_channel(VersionInfo::CHANNEL_STABLE);
+    ScopedCurrentChannel current_channel(VersionInfo::CHANNEL_STABLE);
     EXPECT_NE(Feature::IS_AVAILABLE, feature->IsAvailableToManifest(
         "1",
         Manifest::TYPE_EXTENSION,
         Feature::UNSPECIFIED_LOCATION,
         Feature::UNSPECIFIED_PLATFORM).result());
     EXPECT_NE(Feature::IS_AVAILABLE, feature->IsAvailableToManifest(
         "2",
         Manifest::TYPE_LEGACY_PACKAGED_APP,
         Feature::UNSPECIFIED_LOCATION,
         Feature::UNSPECIFIED_PLATFORM).result());
   }
 }
 
 }  // namespace extensions