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

chrome/browser/extensions/api/declarative_content/declarative_content_apitest.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/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/common/extensions/features/feature.h"
+#include "chrome/common/extensions/features/feature_channel.h"
 #include "content/public/test/browser_test_utils.h"
 
 namespace extensions {
 namespace {
 
 class DeclarativeContentApiTest : public ExtensionApiTest {
  public:
   DeclarativeContentApiTest()
       // Set the channel to "trunk" since declarativeContent is restricted
       // to trunk.
       : current_channel_(chrome::VersionInfo::CHANNEL_UNKNOWN) {
   }
   virtual ~DeclarativeContentApiTest() {}
 
-  extensions::Feature::ScopedCurrentChannel current_channel_;
+  extensions::ScopedCurrentChannel current_channel_;
 };
 
 IN_PROC_BROWSER_TEST_F(DeclarativeContentApiTest, Overview) {
   ExtensionTestMessageListener ready("ready", true);
   const Extension* extension =
       LoadExtension(test_data_dir_.AppendASCII("declarative_content/overview"));
   ASSERT_TRUE(extension);
   const ExtensionAction* page_action =
       ExtensionActionManager::Get(browser()->profile())->
       GetPageAction(*extension);
@@ skipping 26 matching lines @@
   ASSERT_TRUE(content::ExecuteScript(
       tab, "document.body.innerHTML = 'Hello world';"));
   // Give the mutation observer a chance to run and send back the
   // matching-selector update.
   ASSERT_TRUE(content::ExecuteScript(tab, std::string()));
   EXPECT_FALSE(page_action->GetIsVisible(tab_id));
 }
 
 }  // namespace
 }  // namespace extensions