Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Side by Side Diff: chrome/browser/media/encrypted_media_browsertest.cc

Issue 2446403002: Disable browser_tests : EncryptedMediaTest.FrameSizeChangeVideo on Win (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <memory> 5 #include <memory>
6 #include <utility> 6 #include <utility>
7 7
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
506 } 506 }
507 507
508 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) { 508 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) {
509 if (!IsPlayBackPossible(CurrentKeySystem())) { 509 if (!IsPlayBackPossible(CurrentKeySystem())) {
510 DVLOG(0) << "Skipping test - ConfigChange test requires video playback."; 510 DVLOG(0) << "Skipping test - ConfigChange test requires video playback.";
511 return; 511 return;
512 } 512 }
513 TestConfigChange(); 513 TestConfigChange();
514 } 514 }
515 515
516 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameSizeChangeVideo) { 516 // Flaky on Windows. http://crbug.com/655630
517 // Times out on Windows XP. http://crbug.com/171937
518 #if defined(OS_WIN) 517 #if defined(OS_WIN)
519 if (base::win::GetVersion() < base::win::VERSION_VISTA) 518 #define MAYBE_FrameSizeChangeVideo DISABLED_FrameSizeChangeVideo
520 return; 519 #else
520 #define MAYBE_FrameSizeChangeVideo FrameSizeChangeVideo
521 #endif 521 #endif
522 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, MAYBE_FrameSizeChangeVideo) {
522 if (!IsPlayBackPossible(CurrentKeySystem())) { 523 if (!IsPlayBackPossible(CurrentKeySystem())) {
523 DVLOG(0) << "Skipping test - FrameSizeChange test requires video playback."; 524 DVLOG(0) << "Skipping test - FrameSizeChange test requires video playback.";
524 return; 525 return;
525 } 526 }
526 TestFrameSizeChange(); 527 TestFrameSizeChange();
527 } 528 }
528 529
529 #if defined(USE_PROPRIETARY_CODECS) 530 #if defined(USE_PROPRIETARY_CODECS)
530 // Crashes on Mac only. http://crbug.com/621857 531 // Crashes on Mac only. http://crbug.com/621857
531 #if defined(OS_MACOSX) 532 #if defined(OS_MACOSX)
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
647 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadLoadableSession) { 648 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadLoadableSession) {
648 TestPlaybackCase(kExternalClearKeyKeySystem, kLoadableSession, kEnded); 649 TestPlaybackCase(kExternalClearKeyKeySystem, kLoadableSession, kEnded);
649 } 650 }
650 651
651 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadUnknownSession) { 652 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadUnknownSession) {
652 TestPlaybackCase(kExternalClearKeyKeySystem, kUnknownSession, 653 TestPlaybackCase(kExternalClearKeyKeySystem, kUnknownSession,
653 kEmeSessionNotFound); 654 kEmeSessionNotFound);
654 } 655 }
655 656
656 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS) 657 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698