diff options
| author | phoglund <phoglund@chromium.org> | 2014-10-21 01:48:36 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-21 08:49:09 +0000 |
| commit | a2822d2f12db6e00d4d93a2316318a53f18531d6 (patch) | |
| tree | eaa7fbe1610434fe074c9e30c7ae1c0bf315c5c5 | |
| parent | 1a41fa7ed7b892bfdafbfde9beb12a265c722203 (diff) | |
| download | chromium_src-a2822d2f12db6e00d4d93a2316318a53f18531d6.zip chromium_src-a2822d2f12db6e00d4d93a2316318a53f18531d6.tar.gz chromium_src-a2822d2f12db6e00d4d93a2316318a53f18531d6.tar.bz2 | |
Disabling flaky WebRtcAecDumpBrowserTest.TwoCallsWithAecDump on Win XP.
BUG=425034
Review URL: https://codereview.chromium.org/669593002
Cr-Commit-Position: refs/heads/master@{#300437}
| -rw-r--r-- | content/browser/media/webrtc_aecdump_browsertest.cc | 5 | ||||
| -rw-r--r-- | content/test/webrtc_content_browsertest_base.cc | 12 | ||||
| -rw-r--r-- | content/test/webrtc_content_browsertest_base.h | 2 |
3 files changed, 19 insertions, 0 deletions
diff --git a/content/browser/media/webrtc_aecdump_browsertest.cc b/content/browser/media/webrtc_aecdump_browsertest.cc index d5efad0..871ca12 100644 --- a/content/browser/media/webrtc_aecdump_browsertest.cc +++ b/content/browser/media/webrtc_aecdump_browsertest.cc @@ -168,6 +168,11 @@ IN_PROC_BROWSER_TEST_F(WebRtcAecDumpBrowserTest, #endif IN_PROC_BROWSER_TEST_F(WebRtcAecDumpBrowserTest, MAYBE_TwoCallsWithAecDump) { + if (OnWinXp()) { + // http://crbug.com/425034. + LOG(INFO) << "Disabled on Win XP: skipping test..."; + return; + } if (!media::AudioManager::Get()->HasAudioOutputDevices()) { LOG(INFO) << "Missing output devices: skipping test..."; return; diff --git a/content/test/webrtc_content_browsertest_base.cc b/content/test/webrtc_content_browsertest_base.cc index db83501..e6c3b46 100644 --- a/content/test/webrtc_content_browsertest_base.cc +++ b/content/test/webrtc_content_browsertest_base.cc @@ -17,6 +17,10 @@ #include "chromeos/audio/cras_audio_handler.h" #endif +#if defined(OS_WIN) +#include "base/win/windows_version.h" +#endif + namespace content { void WebRtcContentBrowserTest::SetUpCommandLine(CommandLine* command_line) { @@ -97,4 +101,12 @@ void WebRtcContentBrowserTest::DisableOpusIfOnAndroid() { #endif } +bool WebRtcContentBrowserTest::OnWinXp() const { +#if defined(OS_WIN) + return base::win::GetVersion() <= base::win::VERSION_XP; +#else + return false; +#endif +} + } // namespace content diff --git a/content/test/webrtc_content_browsertest_base.h b/content/test/webrtc_content_browsertest_base.h index 804be5a..719bd48 100644 --- a/content/test/webrtc_content_browsertest_base.h +++ b/content/test/webrtc_content_browsertest_base.h @@ -37,6 +37,8 @@ class WebRtcContentBrowserTest: public ContentBrowserTest { int max_height, int min_frame_rate, int max_frame_rate) const; + + bool OnWinXp() const; }; } // namespace content |