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

chrome/browser/extensions/active_tab_unittest.cc

Index: chrome/browser/extensions/active_tab_unittest.cc
diff --git a/chrome/browser/extensions/active_tab_unittest.cc b/chrome/browser/extensions/active_tab_unittest.cc
index 35e5e48b3d7972ff49771e64f6ae7628a76bad79..20d217ae927e9d953f01e4c24038cbacde5e2293 100644
--- a/chrome/browser/extensions/active_tab_unittest.cc
+++ b/chrome/browser/extensions/active_tab_unittest.cc
@@ -58,13 +58,8 @@ class ActiveTabTest : public TabContentsTestHarness {
       : extension(CreateTestExtension("deadbeef", true)),
         another_extension(CreateTestExtension("feedbeef", true)),
         extension_without_active_tab(CreateTestExtension("badbeef", false)),
-        ui_thread_(BrowserThread::UI, MessageLoop::current()) {
-  }
-
-  virtual void SetUp() {
-    TabContentsTestHarness::SetUp();
-    Feature::SetChannelForTesting(chrome::VersionInfo::CHANNEL_UNKNOWN);
-  }
+        ui_thread_(BrowserThread::UI, MessageLoop::current()),
+        current_channel_(chrome::VersionInfo::CHANNEL_UNKNOWN) {}
 
  protected:
   int tab_id() {
@@ -122,6 +117,7 @@ class ActiveTabTest : public TabContentsTestHarness {
 
  private:
   content::TestBrowserThread ui_thread_;
+  Feature::ScopedCurrentChannel current_channel_;
 };
 
 TEST_F(ActiveTabTest, GrantToSinglePage) {