diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 18:38:51 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 18:38:51 +0000 |
| commit | 26807c6123b72a2ab30ff3fb2d5ab1e154fc3585 (patch) | |
| tree | a83ac0514bbfedbcc997dc4ea887b23c8a650c71 /chrome/browser | |
| parent | b0c5dfb609b0c2f77e8f3ce28b43975717512942 (diff) | |
| download | chromium_src-26807c6123b72a2ab30ff3fb2d5ab1e154fc3585.zip chromium_src-26807c6123b72a2ab30ff3fb2d5ab1e154fc3585.tar.gz chromium_src-26807c6123b72a2ab30ff3fb2d5ab1e154fc3585.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/extensions/extension_browsertest.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/extensions/lazy_background_page_apitest.cc | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc index 2c1532b..40652e9 100644 --- a/chrome/browser/extensions/extension_browsertest.cc +++ b/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"); diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc index 23a067c..32cb9e3 100644 --- a/chrome/browser/extensions/lazy_background_page_apitest.cc +++ b/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); |