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

chrome/browser/extensions/active_tab_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 <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/values.h"
@@ skipping 40 matching lines @@
       .SetID(id)
       .Build();
 }
 
 class ActiveTabTest : public TabContentsTestHarness {
  public:
   ActiveTabTest()
       : 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_DEV) {}
 
  protected:
   int tab_id() {
     return SessionID::IdForTab(tab_contents());
   }
 
   ActiveTabPermissionManager* active_tab_permission_manager() {
     return tab_contents()->extension_tab_helper()->
                            active_tab_permission_manager();
   }
@@ skipping 37 matching lines @@
   scoped_refptr<const Extension> extension;
 
   // Another extension with activeTab (for good measure).
   scoped_refptr<const Extension> another_extension;
 
   // An extension without the activeTab permission.
   scoped_refptr<const Extension> extension_without_active_tab;
 
  private:
   content::TestBrowserThread ui_thread_;
+  Feature::ScopedCurrentChannel current_channel_;
 };
 
 TEST_F(ActiveTabTest, GrantToSinglePage) {
   GURL google("http://www.google.com");
   NavigateAndCommit(google);
 
   // No access unless it's been granted.
   EXPECT_TRUE(IsBlocked(extension, google));
   EXPECT_TRUE(IsBlocked(another_extension, google));
   EXPECT_TRUE(IsBlocked(extension_without_active_tab, google));
@@ skipping 179 matching lines @@
   Reload();
 
   EXPECT_FALSE(IsAllowed(extension, google, tab_id()));
   EXPECT_FALSE(IsAllowed(extension, google_h1, tab_id()));
   EXPECT_FALSE(IsAllowed(extension, chromium, tab_id()));
   EXPECT_FALSE(IsAllowed(extension, chromium_h1, tab_id()));
 }
 
 }  // namespace
 }  // namespace extensions