diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 22:48:54 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 22:48:54 +0000 |
| commit | 33301f584a4b3d42e223f9bcdced832729b6e87b (patch) | |
| tree | 96d40895c51ed5f08c2e7585c95233d24abd57bb /chrome/browser/extensions/api/media_galleries_private | |
| parent | cf7a870443f129b044dc488d7d9f13a06cefc4e7 (diff) | |
| download | chromium_src-33301f584a4b3d42e223f9bcdced832729b6e87b.zip chromium_src-33301f584a4b3d42e223f9bcdced832729b6e87b.tar.gz chromium_src-33301f584a4b3d42e223f9bcdced832729b6e87b.tar.bz2 | |
Disable DeviceAttachDetachEvents on Linux Aura build
Test flakily times out.
TBR=asargent@chromium.org
BUG=247336
Review URL: https://codereview.chromium.org/17098005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206503 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/api/media_galleries_private')
| -rw-r--r-- | chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc index 2f2d619..197a01e 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc @@ -108,8 +108,9 @@ class MediaGalleriesPrivateApiTest : public ExtensionApiTest { DISALLOW_COPY_AND_ASSIGN(MediaGalleriesPrivateApiTest); }; -// TODO(jschuh): Flaky on Win64 build. crbug.com/247336 -#if defined(OS_WIN) && defined(ARCH_CPU_X86_64) +// TODO(jschuh): Flaky on Win64 & Linux Aura build. crbug.com/247336 +#if (defined(OS_WIN) && defined(ARCH_CPU_X86_64)) || \ + (defined(OS_LINUX) && defined(USE_AURA)) #define MAYBE_DeviceAttachDetachEvents DISABLED_DeviceAttachDetachEvents #else #define MAYBE_DeviceAttachDetachEvents DeviceAttachDetachEvents |