Set the Feature's ChannelForTesting to Trunk during extension tests, so that

they pass on beta/stable builds even if the features are restricted to
dev/trunk.

BUG=136629
TEST=no

Review URL: https://chromiumcodereview.appspot.com/10704149

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146156 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/extensions/extension_browsertest.cc

@@ -29,6 +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/test/base/ui_test_utils.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
@@ -58,6 +59,9 @@ void ExtensionBrowserTest::SetUpCommandLine(CommandLine* command_line) {
   // This enables DOM automation for tab contentses.
   EnableDOMAutomation();
 
+  extensions::Feature::SetChannelForTesting(
+      chrome::VersionInfo::CHANNEL_UNKNOWN);
+
   PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_);
   test_data_dir_ = test_data_dir_.AppendASCII("extensions");
 

chrome/browser/extensions/lazy_background_page_apitest.cc

@@ -71,7 +71,7 @@ class LoadedIncognitoObserver : public content::NotificationObserver {
 }  // namespace
 
 class LazyBackgroundPageApiTest : public ExtensionApiTest {
-public:
+ public:
   void SetUpCommandLine(CommandLine* command_line) {
     ExtensionApiTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);

chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc

@@ -11,6 +11,7 @@
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
+#include "chrome/common/extensions/features/feature.h"
 #include "chrome/common/extensions/features/simple_feature_provider.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -88,6 +89,7 @@ TEST_F(ExtensionManifestTest, BackgroundAllowNoJsAccess) {
 TEST_F(ExtensionManifestTest, BackgroundPageWebRequest) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableExperimentalExtensionApis);
+  Feature::SetChannelForTesting(chrome::VersionInfo::CHANNEL_UNKNOWN);
 
   std::string error;
   scoped_ptr<DictionaryValue> manifest(