Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / browser / media / webrtc_aecdump_browsertest.cc

diff --git a/src/content/browser/media/webrtc_aecdump_browsertest.cc b/src/content/browser/media/webrtc_aecdump_browsertest.cc
index e5859be..bdeed59 100644 (file)
--- a/src/content/browser/media/webrtc_aecdump_browsertest.cc
+++ b/src/content/browser/media/webrtc_aecdump_browsertest.cc
@@ -38,7 +38,7 @@ namespace content {
 class WebRtcAecDumpBrowserTest : public WebRtcContentBrowserTest {
  public:
   WebRtcAecDumpBrowserTest() {}
-  virtual ~WebRtcAecDumpBrowserTest() {}
+  ~WebRtcAecDumpBrowserTest() override {}
 };
 
 #if defined(OS_WIN)
@@ -53,9 +53,6 @@ class WebRtcAecDumpBrowserTest : public WebRtcContentBrowserTest {
 #elif defined(OS_ANDROID) && defined(ADDRESS_SANITIZER)
 // Renderer crashes under Android ASAN: https://crbug.com/408496.
 #define MAYBE_CallWithAecDump DISABLED_CallWithAecDump
-#elif defined(OS_WIN) && !defined(NDEBUG)
-// Flaky on Webkit Win7 Debug bot: http://crbug.com/417756
-#define MAYBE_CallWithAecDump DISABLED_CallWithAecDump
 #else
 #define MAYBE_CallWithAecDump CallWithAecDump
 #endif
@@ -171,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;