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

chrome/browser/extensions/extension_browsertest.cc

Index: chrome/browser/extensions/extension_browsertest.cc
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index e5cd7f5e131208bc475406c515d40bd10337fa4f..44ebee969efef0e29752be68f3b37210dc667147 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -29,7 +29,7 @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/extensions/features/feature.h"
+#include "chrome/common/chrome_version_info.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
@@ -47,7 +47,8 @@ ExtensionBrowserTest::ExtensionBrowserTest()
       extension_installs_observed_(0),
       extension_load_errors_observed_(0),
       target_page_action_count_(-1),
-      target_visible_page_action_count_(-1) {
+      target_visible_page_action_count_(-1),
+      current_channel_(chrome::VersionInfo::CHANNEL_UNKNOWN) {
   EXPECT_TRUE(temp_dir_.CreateUniqueTempDir());
   AppShortcutManager::SetShortcutCreationDisabledForTesting(true);
 }
@@ -57,9 +58,6 @@ ExtensionBrowserTest::~ExtensionBrowserTest() {
 }
 
 void ExtensionBrowserTest::SetUpCommandLine(CommandLine* command_line) {
-  extensions::Feature::SetChannelForTesting(
-      chrome::VersionInfo::CHANNEL_UNKNOWN);
-
   PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_);
   test_data_dir_ = test_data_dir_.AppendASCII("extensions");