Disable flaky EncryptedMediaTest tests on Windows which are blocking the commit queue.

chrome/browser/media/encrypted_media_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/media/media_browsertest.h"
@@ skipping 516 matching lines @@
                                 Values(SRC),
                                 Values(PREFIXED)));
 
 INSTANTIATE_TEST_CASE_P(SRC_ClearKey,
                         EncryptedMediaTest,
                         Combine(Values(kClearKeyKeySystem),
                                 Values(SRC),
                                 Values(UNPREFIXED)));
 #endif  // !defined(OS_ANDROID)
 
-#if !defined(OS_WIN) || defined(NDEBUG)
+#if !defined(OS_WIN)
 // Tests flaky on Win 7 dbg. http://crbug.com/517018
 INSTANTIATE_TEST_CASE_P(MSE_ClearKey_Prefixed,
                         EncryptedMediaTest,
                         Combine(Values(kPrefixedClearKeyKeySystem),
                                 Values(MSE),
                                 Values(PREFIXED)));
 INSTANTIATE_TEST_CASE_P(MSE_ClearKey,
                         EncryptedMediaTest,
                         Combine(Values(kClearKeyKeySystem),
                                 Values(MSE),
                                 Values(UNPREFIXED)));
-#endif  // !defined(OS_WIN) || defined(NDEBUG)
+#endif  // !defined(OS_WIN)
 
 // External Clear Key is currently only used on platforms that use Pepper CDMs.
 #if defined(ENABLE_PEPPER_CDMS)
 INSTANTIATE_TEST_CASE_P(SRC_ExternalClearKey_Prefixed,
                         EncryptedMediaTest,
                         Combine(Values(kExternalClearKeyKeySystem),
                                 Values(SRC),
                                 Values(PREFIXED)));
 INSTANTIATE_TEST_CASE_P(SRC_ExternalClearKey,
                         EncryptedMediaTest,
                         Combine(Values(kExternalClearKeyKeySystem),
                                 Values(SRC),
                                 Values(UNPREFIXED)));
-#if !defined(OS_WIN) || defined(NDEBUG)
+#if !defined(OS_WIN)
 // Tests flaky on Win 7 dbg. http://crbug.com/517018
 INSTANTIATE_TEST_CASE_P(MSE_ExternalClearKey_Prefixed,
                         EncryptedMediaTest,
                         Combine(Values(kExternalClearKeyKeySystem),
                                 Values(MSE),
                                 Values(PREFIXED)));
 INSTANTIATE_TEST_CASE_P(MSE_ExternalClearKey,
                         EncryptedMediaTest,
                         Combine(Values(kExternalClearKeyKeySystem),
                                 Values(MSE),
                                 Values(UNPREFIXED)));
 // To reduce test time, only run ExternalClearKeyDecryptOnly with MSE.
 INSTANTIATE_TEST_CASE_P(MSE_ExternalClearKeyDecryptOnly_Prefixed,
                         EncryptedMediaTest,
                         Combine(Values(kExternalClearKeyDecryptOnlyKeySystem),
                                 Values(MSE),
                                 Values(PREFIXED)));
 INSTANTIATE_TEST_CASE_P(MSE_ExternalClearKeyDecryptOnly,
                         EncryptedMediaTest,
                         Combine(Values(kExternalClearKeyDecryptOnlyKeySystem),
                                 Values(MSE),
                                 Values(UNPREFIXED)));
-#endif  // !defined(OS_WIN) || defined(NDEBUG)
+#endif  // !defined(OS_WIN)
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
 #if defined(WIDEVINE_CDM_AVAILABLE)
 
 // Prefixed Widevine tests fail in Chrome OS official builds due to the request
 // for permissions. Since prefixed EME is deprecated and will be removed soon,
 // don't run these tests. http://crbug.com/430711
 #if !(defined(OS_CHROMEOS) && defined(OFFICIAL_BUILD))
 
 // This test doesn't fully test playback with Widevine. So we only run Widevine
@@ skipping 244 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(ECKPrefixedEncryptedMediaTest, LoadLoadableSession) {
   TestPlaybackCase(kLoadableSession, kEnded);
 }
 
 IN_PROC_BROWSER_TEST_F(ECKPrefixedEncryptedMediaTest, LoadUnknownSession) {
   TestPlaybackCase(kUnknownSession, kPrefixedEmeErrorEvent);
 }
 #endif  // defined(ENABLE_PEPPER_CDMS)