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

chrome/common/extensions/manifest_tests/extension_manifests_background_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/manifest_tests/extension_manifest_test.h"
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/common/extensions/background_info.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
-#include "chrome/common/extensions/features/base_feature_provider.h"
-#include "chrome/common/extensions/features/feature.h"
+#include "chrome/common/extensions/features/feature_channel.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/error_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace errors = extension_manifest_errors;
 namespace keys = extension_manifest_keys;
 
 namespace extensions {
 
 class ExtensionManifestBackgroundTest : public ExtensionManifestTest {
@@ skipping 57 matching lines @@
   extension = LoadAndExpectSuccess("background_allow_no_js_access.json");
   ASSERT_TRUE(extension.get());
   EXPECT_FALSE(BackgroundInfo::AllowJSAccess(extension.get()));
 
   extension = LoadAndExpectSuccess("background_allow_no_js_access2.json");
   ASSERT_TRUE(extension.get());
   EXPECT_FALSE(BackgroundInfo::AllowJSAccess(extension.get()));
 }
 
 TEST_F(ExtensionManifestBackgroundTest, BackgroundPageWebRequest) {
-  Feature::ScopedCurrentChannel current_channel(
-      chrome::VersionInfo::CHANNEL_DEV);
+  ScopedCurrentChannel current_channel(chrome::VersionInfo::CHANNEL_DEV);
 
   std::string error;
   scoped_ptr<base::DictionaryValue> manifest(
       LoadManifest("background_page.json", &error));
   ASSERT_TRUE(manifest.get());
   manifest->SetBoolean(keys::kBackgroundPersistent, false);
   manifest->SetInteger(keys::kManifestVersion, 2);
   scoped_refptr<Extension> extension(
       LoadAndExpectSuccess(Manifest(manifest.get(), "")));
   ASSERT_TRUE(extension.get());
   EXPECT_TRUE(BackgroundInfo::HasLazyBackgroundPage(extension.get()));
 
   base::ListValue* permissions = new base::ListValue();
   permissions->Append(new base::StringValue("webRequest"));
   manifest->Set(keys::kPermissions, permissions);
   LoadAndExpectError(Manifest(manifest.get(), ""),
                      errors::kWebRequestConflictsWithLazyBackground);
 }
 
 }  // namespace extensions