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/autofill | |
| 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/autofill')
| -rw-r--r-- | chrome/browser/autofill/autofill_browsertest.cc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc index 1b37b32..9baa482 100644 --- a/chrome/browser/autofill/autofill_browsertest.cc +++ b/chrome/browser/autofill/autofill_browsertest.cc @@ -5,6 +5,7 @@ #include <string> #include "base/basictypes.h" +#include "base/command_line.h" #include "base/file_util.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" @@ -26,6 +27,7 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/render_messages.h" #include "chrome/test/base/in_process_browser_test.h" +#include "chrome/test/base/test_switches.h" #include "chrome/test/base/ui_test_utils.h" #include "components/autofill/content/browser/autofill_driver_impl.h" #include "components/autofill/core/browser/autofill_common_test.h" @@ -51,11 +53,6 @@ #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/keycodes/keyboard_codes.h" -#if defined(OS_WIN) && defined(USE_ASH) -#include "base/win/windows_version.h" -#endif - - namespace autofill { static const char* kDataURIPrefix = "data:text/html;charset=utf-8,"; @@ -1183,7 +1180,7 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, PrefsStringSavedAsIs) { IN_PROC_BROWSER_TEST_F(AutofillTest, InvalidCreditCardNumberIsNotAggregated) { #if defined(OS_WIN) && defined(USE_ASH) // Disable this test in Metro+Ash for now (http://crbug.com/262796). - if (base::win::GetVersion() >= base::win::VERSION_WIN8) + if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) return; #endif @@ -1203,8 +1200,8 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, InvalidCreditCardNumberIsNotAggregated) { IN_PROC_BROWSER_TEST_F(AutofillTest, WhitespacesAndSeparatorCharsStrippedForValidCCNums) { #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 @@ -1414,7 +1411,7 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, AppendCountryCodeForAggregatedPhones) { IN_PROC_BROWSER_TEST_F(AutofillTest, CCInfoNotStoredWhenAutocompleteOff) { #if defined(OS_WIN) && defined(USE_ASH) // Disable this test in Metro+Ash for now (http://crbug.com/262796). - if (base::win::GetVersion() >= base::win::VERSION_WIN8) + if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) return; #endif |