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

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

Issue 582233003: CDM FileIOTest: Work around flakiness by not closing during read/write. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months 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 | media/cdm/ppapi/cdm_file_io_test.cc » ('j') | 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "base/win/windows_version.h" 9 #include "base/win/windows_version.h"
10 #include "chrome/browser/media/media_browsertest.h" 10 #include "chrome/browser/media/media_browsertest.h"
(...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after
630 630
631 // Testing that the media browser test does fail on plugin crash. 631 // Testing that the media browser test does fail on plugin crash.
632 // crbug.com/386657 632 // crbug.com/386657
633 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, DISABLED_CDMExpectedCrash) { 633 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, DISABLED_CDMExpectedCrash) {
634 // Plugin crash is not ignored by default, the test is expected to fail. 634 // Plugin crash is not ignored by default, the test is expected to fail.
635 EXPECT_NONFATAL_FAILURE( 635 EXPECT_NONFATAL_FAILURE(
636 TestNonPlaybackCases(kExternalClearKeyCrashKeySystem, kError), 636 TestNonPlaybackCases(kExternalClearKeyCrashKeySystem, kError),
637 "plugin crash"); 637 "plugin crash");
638 } 638 }
639 639
640 // Disabled on Windows because this flakily causes failures in ~File, which 640 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, FileIOTest) {
641 // causes base::ThreadRestrictions::AssertIOAllowed problems. crbug.com/415742
642 #if defined(OS_WIN)
643 #define MAYBE_FileIOTest DISABLED_FileIOTest
644 #else
645 #define MAYBE_FileIOTest FileIOTest
646 #endif
647 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, MAYBE_FileIOTest) {
648 TestNonPlaybackCases(kExternalClearKeyFileIOTestKeySystem, 641 TestNonPlaybackCases(kExternalClearKeyFileIOTestKeySystem,
649 kFileIOTestSuccess); 642 kFileIOTestSuccess);
650 } 643 }
651 644
652 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadLoadableSession) { 645 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadLoadableSession) {
653 RunEncryptedMediaTest(kDefaultEmePlayer, 646 RunEncryptedMediaTest(kDefaultEmePlayer,
654 "bear-320x240-v_enc-v.webm", 647 "bear-320x240-v_enc-v.webm",
655 kWebMVideoOnly, 648 kWebMVideoOnly,
656 kExternalClearKeyKeySystem, 649 kExternalClearKeyKeySystem,
657 SRC, 650 SRC,
658 PREFIXED, 651 PREFIXED,
659 kLoadableSession, 652 kLoadableSession,
660 false, 653 false,
661 kEnded); 654 kEnded);
662 } 655 }
663 656
664 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadUnknownSession) { 657 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadUnknownSession) {
665 // TODO(xhwang): Add a specific error for this failure, e.g. kSessionNotFound. 658 // TODO(xhwang): Add a specific error for this failure, e.g. kSessionNotFound.
666 RunEncryptedMediaTest(kDefaultEmePlayer, 659 RunEncryptedMediaTest(kDefaultEmePlayer,
667 "bear-320x240-v_enc-v.webm", 660 "bear-320x240-v_enc-v.webm",
668 kWebMVideoOnly, 661 kWebMVideoOnly,
669 kExternalClearKeyKeySystem, 662 kExternalClearKeyKeySystem,
670 SRC, 663 SRC,
671 PREFIXED, 664 PREFIXED,
672 kUnknownSession, 665 kUnknownSession,
673 false, 666 false,
674 kEmeKeyError); 667 kEmeKeyError);
675 } 668 }
676 #endif // defined(ENABLE_PEPPER_CDMS) 669 #endif // defined(ENABLE_PEPPER_CDMS)
OLDNEW
« no previous file with comments | « no previous file | media/cdm/ppapi/cdm_file_io_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698