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

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

Issue 1849593002: media: Enable SRC content EncryptedMediaTest on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase/simplify Created 4 years, 8 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 | 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/strings/utf_string_conversions.h" 6 #include "base/strings/utf_string_conversions.h"
7 #include "base/win/windows_version.h" 7 #include "base/win/windows_version.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "content/browser/media/media_browsertest.h" 9 #include "content/browser/media/media_browsertest.h"
10 #include "content/public/common/content_switches.h" 10 #include "content/public/common/content_switches.h"
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 129
130 void SetUpCommandLine(base::CommandLine* command_line) override { 130 void SetUpCommandLine(base::CommandLine* command_line) override {
131 command_line->AppendSwitch( 131 command_line->AppendSwitch(
132 switches::kDisableGestureRequirementForMediaPlayback); 132 switches::kDisableGestureRequirementForMediaPlayback);
133 } 133 }
134 }; 134 };
135 135
136 using ::testing::Combine; 136 using ::testing::Combine;
137 using ::testing::Values; 137 using ::testing::Values;
138 138
139 #if !defined(OS_ANDROID)
140 // Encrypted media playback with SRC is not supported on Android.
141 INSTANTIATE_TEST_CASE_P(SRC_ClearKey, EncryptedMediaTest, 139 INSTANTIATE_TEST_CASE_P(SRC_ClearKey, EncryptedMediaTest,
142 Combine(Values(kClearKeyKeySystem), Values(SRC))); 140 Combine(Values(kClearKeyKeySystem), Values(SRC)));
143 #endif // !defined(OS_ANDROID)
144 141
145 INSTANTIATE_TEST_CASE_P(MSE_ClearKey, EncryptedMediaTest, 142 INSTANTIATE_TEST_CASE_P(MSE_ClearKey, EncryptedMediaTest,
146 Combine(Values(kClearKeyKeySystem), Values(MSE))); 143 Combine(Values(kClearKeyKeySystem), Values(MSE)));
147 144
148 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_WebM) { 145 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_WebM) {
149 TestSimplePlayback("bear-a_enc-a.webm", kWebMAudioOnly); 146 TestSimplePlayback("bear-a_enc-a.webm", kWebMAudioOnly);
150 } 147 }
151 148
152 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioClearVideo_WebM) { 149 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioClearVideo_WebM) {
153 TestSimplePlayback("bear-320x240-av_enc-a.webm", kWebMAudioVideo); 150 TestSimplePlayback("bear-320x240-av_enc-a.webm", kWebMAudioVideo);
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) { 201 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) {
205 RunEncryptedMediaTest(kDefaultEmePlayer, 202 RunEncryptedMediaTest(kDefaultEmePlayer,
206 "bear-a_enc-a.webm", 203 "bear-a_enc-a.webm",
207 kWebMAudioOnly, 204 kWebMAudioOnly,
208 "com.example.foo", 205 "com.example.foo",
209 MSE, 206 MSE,
210 kEmeNotSupportedError); 207 kEmeNotSupportedError);
211 } 208 }
212 209
213 } // namespace content 210 } // namespace content
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