summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-28 00:23:03 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-28 00:23:03 +0000
commitf70559cfae677cc0c14c61a9357b90022d21c294 (patch)
treea004bff2d1cc0704acf31c9876acf31453eaeee3
parent07bd6686455d2e2f4e84ab1068cdb731ca528278 (diff)
downloadchromium_src-f70559cfae677cc0c14c61a9357b90022d21c294.zip
chromium_src-f70559cfae677cc0c14c61a9357b90022d21c294.tar.gz
chromium_src-f70559cfae677cc0c14c61a9357b90022d21c294.tar.bz2
Disable DevToolsSanityTest.TestDeviceEmulation on Windows.
BUG=397888 TBR=jchaffraix@chromium.org Review URL: https://codereview.chromium.org/421843002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285847 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/devtools/devtools_sanity_browsertest.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc
index 913d4d5..167ac1b 100644
--- a/chrome/browser/devtools/devtools_sanity_browsertest.cc
+++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc
@@ -794,8 +794,13 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestConsoleOnNavigateBack) {
RunTest("testConsoleOnNavigateBack", kNavigateBackTestPage);
}
-
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestDeviceEmulation) {
+#if defined(OS_WIN)
+// http://crbug.com/397888
+#define MAYBE_TestDeviceEmulation DISABLED_TestDeviceEmulation
+#else
+#define MAYBE_TestDeviceEmulation TestDeviceEmulation
+#endif
+IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestDeviceEmulation) {
RunTest("testDeviceMetricsOverrides", "about:blank");
}