summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authorrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-15 14:03:16 +0000
committerrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-15 14:03:16 +0000
commit0f1c4e338273057d08939fb1b3825797f1a87a00 (patch)
tree357fff21ec3d4c121d9a5f95a484130c09f58b49 /ash
parente476ce916ebdd785705870f928ab435aaa97ab11 (diff)
downloadchromium_src-0f1c4e338273057d08939fb1b3825797f1a87a00.zip
chromium_src-0f1c4e338273057d08939fb1b3825797f1a87a00.tar.gz
chromium_src-0f1c4e338273057d08939fb1b3825797f1a87a00.tar.bz2
Enable win8 ash tests.
BUG=154081 TEST=ash_unittests.exe run on the Win8 bot. Review URL: https://chromiumcodereview.appspot.com/12259011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182703 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/test/ash_unittests.cc14
1 files changed, 0 insertions, 14 deletions
diff --git a/ash/test/ash_unittests.cc b/ash/test/ash_unittests.cc
index 7374ada..7602d9a 100644
--- a/ash/test/ash_unittests.cc
+++ b/ash/test/ash_unittests.cc
@@ -4,20 +4,6 @@
#include "ash/test/test_suite.h"
-#if defined(OS_WIN)
-#include "base/command_line.h"
-#include "base/win/windows_version.h"
-#endif
-
int main(int argc, char** argv) {
-#if defined(OS_WIN)
- CommandLine::Init(argc, argv);
- // Disabled on Win8 until they're passing cleanly. http://crbug.com/154081
- // Can be optionally enabled via a command line flag (handy for developing)
- // until such time.
- if (base::win::GetVersion() >= base::win::VERSION_WIN8 &&
- !CommandLine::ForCurrentProcess()->HasSwitch("ash-metro-tests"))
- return 0;
-#endif
return ash::test::AuraShellTestSuite(argc, argv).Run();
}