diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-05 22:42:30 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-05 22:42:30 +0000 |
| commit | 2849265b9ab4b121e59a2243f365adefc6c5dc33 (patch) | |
| tree | 6d70bb0fb21a4bd6bd5e6e38199035bb1f1e2f5f | |
| parent | 7eb6bec6aa7ee97313e501157faad40a573d5f34 (diff) | |
| download | chromium_src-2849265b9ab4b121e59a2243f365adefc6c5dc33.zip chromium_src-2849265b9ab4b121e59a2243f365adefc6c5dc33.tar.gz chromium_src-2849265b9ab4b121e59a2243f365adefc6c5dc33.tar.bz2 | |
Disable TabCaptureApiTest.EndToEnd on Mac because it's flaking on trybots.
BUG=326328
TBR=miu@chromium.org
Review URL: https://codereview.chromium.org/103423005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239060 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc index 1197866..d0bdec2 100644 --- a/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc +++ b/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc @@ -92,7 +92,8 @@ IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, ApiTestsAudio) { } // http://crbug.com/177163 -#if defined(OS_WIN) && !defined(NDEBUG) +// http://crbug.com/326328 +#if (defined(OS_WIN) && !defined(NDEBUG)) || defined(OS_MACOSX) #define MAYBE_EndToEnd DISABLED_EndToEnd #else #define MAYBE_EndToEnd EndToEnd |