diff options
| author | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-31 00:37:33 +0000 |
|---|---|---|
| committer | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-31 00:37:33 +0000 |
| commit | b65d4bdcc48f230a83049cc93de2eaf375e7620f (patch) | |
| tree | 845f4a75ef89121cb2680e5b4915f35a397930fa /chrome/browser/extensions/platform_app_browsertest.cc | |
| parent | 4160df37171371798ed5f6768a05abc7841347a9 (diff) | |
| download | chromium_src-b65d4bdcc48f230a83049cc93de2eaf375e7620f.zip chromium_src-b65d4bdcc48f230a83049cc93de2eaf375e7620f.tar.gz chromium_src-b65d4bdcc48f230a83049cc93de2eaf375e7620f.tar.bz2 | |
Disable Ash browser tests by detecting command-line switch rather than OS version.
The original intent by disabling them per OS version was that regular browser tests don't run on win8_aura bots anyways... but this also makes it annoying as devs on Win8+Aura now can't run these tests as "regular" browser tests...
Disable those tests by detecting the --ash-browsertests command-line flag instead.
BUG=262796
Review URL: https://chromiumcodereview.appspot.com/21112003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214488 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/platform_app_browsertest.cc')
| -rw-r--r-- | chrome/browser/extensions/platform_app_browsertest.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chrome/browser/extensions/platform_app_browsertest.cc b/chrome/browser/extensions/platform_app_browsertest.cc index d193507..55cf56d 100644 --- a/chrome/browser/extensions/platform_app_browsertest.cc +++ b/chrome/browser/extensions/platform_app_browsertest.cc @@ -4,6 +4,7 @@ #include "apps/shell_window.h" #include "base/bind.h" +#include "base/command_line.h" #include "base/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/prefs/pref_service.h" @@ -34,6 +35,7 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" +#include "chrome/test/base/test_switches.h" #include "chrome/test/base/ui_test_utils.h" #include "components/user_prefs/pref_registry_syncable.h" #include "components/web_modal/web_contents_modal_dialog_manager.h" @@ -45,10 +47,6 @@ #include "net/test/embedded_test_server/embedded_test_server.h" #include "url/gurl.h" -#if defined(OS_WIN) && defined(USE_ASH) -#include "base/win/windows_version.h" -#endif - using apps::ShellWindow; using content::WebContents; using web_modal::WebContentsModalDialogManager; @@ -797,8 +795,8 @@ void PlatformAppDevToolsBrowserTest::RunTestWithDevTools( #endif IN_PROC_BROWSER_TEST_F(PlatformAppDevToolsBrowserTest, MAYBE_ReOpenedWithID) { #if defined(OS_WIN) && defined(USE_ASH) - // Disable this test in Metro+Ash for now (http://crbug.com/179830). - if (base::win::GetVersion() >= base::win::VERSION_WIN8) + // Disable this test in Metro+Ash for now (http://crbug.com/262796). + if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) return; #endif RunTestWithDevTools("minimal_id", RELAUNCH | HAS_ID); |