summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkustermann <kustermann@google.com>2014-10-14 07:25:48 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-14 14:26:09 +0000
commitb614f6981808ab7a8ae18795dfcb58f1e6eed8aa (patch)
treeacaaf519377fd8cb4c1000eb8f54be44aa3cfcc2
parentc5ae9409ed54b5fd8dee4e38e167eca903ba52a4 (diff)
downloadchromium_src-b614f6981808ab7a8ae18795dfcb58f1e6eed8aa.zip
chromium_src-b614f6981808ab7a8ae18795dfcb58f1e6eed8aa.tar.gz
chromium_src-b614f6981808ab7a8ae18795dfcb58f1e6eed8aa.tar.bz2
Disable DeviceInertialSensorBrowserTest.MotionNullTestWithAlert on windows
BUG=360578 TBR=timvolodine Review URL: https://codereview.chromium.org/654913002 Cr-Commit-Position: refs/heads/master@{#299478}
-rw-r--r--content/browser/device_sensors/device_inertial_sensor_browsertest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/device_sensors/device_inertial_sensor_browsertest.cc b/content/browser/device_sensors/device_inertial_sensor_browsertest.cc
index 6ef388b..632722e 100644
--- a/content/browser/device_sensors/device_inertial_sensor_browsertest.cc
+++ b/content/browser/device_sensors/device_inertial_sensor_browsertest.cc
@@ -326,7 +326,7 @@ IN_PROC_BROWSER_TEST_F(DeviceInertialSensorBrowserTest,
}
// Flaking in the android try bot. See http://crbug.com/360578.
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(OS_WIN)
#define MAYBE_MotionNullTestWithAlert DISABLED_MotionNullTestWithAlert
#else
#define MAYBE_MotionNullTestWithAlert MotionNullTestWithAlert