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

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

Issue 447353002: Enable HTMLMediaElement@autoplay on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More removals Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | content/browser/media/media_source_browsertest.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 (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 "content/browser/media/media_browsertest.h" 8 #include "content/browser/media/media_browsertest.h"
9 #include "content/public/common/content_switches.h" 9 #include "content/public/common/content_switches.h"
10 #include "content/public/test/browser_test_utils.h" 10 #include "content/public/test/browser_test_utils.h"
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 kEnded); 118 kEnded);
119 } 119 }
120 120
121 protected: 121 protected:
122 // We want to fail quickly when a test fails because an error is encountered. 122 // We want to fail quickly when a test fails because an error is encountered.
123 virtual void AddWaitForTitles(content::TitleWatcher* title_watcher) OVERRIDE { 123 virtual void AddWaitForTitles(content::TitleWatcher* title_watcher) OVERRIDE {
124 MediaBrowserTest::AddWaitForTitles(title_watcher); 124 MediaBrowserTest::AddWaitForTitles(title_watcher);
125 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeNotSupportedError)); 125 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeNotSupportedError));
126 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeKeyError)); 126 title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeKeyError));
127 } 127 }
128
129 #if defined(OS_ANDROID)
130 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
131 command_line->AppendSwitch(
132 switches::kDisableGestureRequirementForMediaPlayback);
133 }
134 #endif
135 }; 128 };
136 129
137 using ::testing::Combine; 130 using ::testing::Combine;
138 using ::testing::Values; 131 using ::testing::Values;
139 132
140 #if !defined(OS_ANDROID) 133 #if !defined(OS_ANDROID)
141 // Encrypted media playback with SRC is not supported on Android. 134 // Encrypted media playback with SRC is not supported on Android.
142 INSTANTIATE_TEST_CASE_P(SRC_ClearKey, EncryptedMediaTest, 135 INSTANTIATE_TEST_CASE_P(SRC_ClearKey, EncryptedMediaTest,
143 Combine(Values(kClearKeyKeySystem), Values(SRC))); 136 Combine(Values(kClearKeyKeySystem), Values(SRC)));
144 #endif // !defined(OS_ANDROID) 137 #endif // !defined(OS_ANDROID)
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) { 175 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) {
183 RunEncryptedMediaTest(kDefaultEmePlayer, 176 RunEncryptedMediaTest(kDefaultEmePlayer,
184 "bear-a_enc-a.webm", 177 "bear-a_enc-a.webm",
185 kWebMAudioOnly, 178 kWebMAudioOnly,
186 "com.example.foo", 179 "com.example.foo",
187 MSE, 180 MSE,
188 kEmeNotSupportedError); 181 kEmeNotSupportedError);
189 } 182 }
190 183
191 } // namespace content 184 } // namespace content
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | content/browser/media/media_source_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698