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

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

Issue 471573002: [Arm64]: Disable MSE_ClearKey/EncryptedMediaTest.FrameSizeChangeVideo on Arm64. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « 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 "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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 168
169 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) { 169 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) {
170 TestConfigChange(); 170 TestConfigChange();
171 } 171 }
172 172
173 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameSizeChangeVideo) { 173 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameSizeChangeVideo) {
174 // Times out on Windows XP. http://crbug.com/171937 174 // Times out on Windows XP. http://crbug.com/171937
175 #if defined(OS_WIN) 175 #if defined(OS_WIN)
176 if (base::win::GetVersion() < base::win::VERSION_VISTA) 176 if (base::win::GetVersion() < base::win::VERSION_VISTA)
177 return; 177 return;
178 #elif defined(__aarch64__)
179 // Times out on arm64 currently due to http://crbug.com/403308
180 return;
178 #endif 181 #endif
179 TestFrameSizeChange(); 182 TestFrameSizeChange();
180 } 183 }
181 184
182 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) { 185 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) {
183 RunEncryptedMediaTest(kDefaultEmePlayer, 186 RunEncryptedMediaTest(kDefaultEmePlayer,
184 "bear-a_enc-a.webm", 187 "bear-a_enc-a.webm",
185 kWebMAudioOnly, 188 kWebMAudioOnly,
186 "com.example.foo", 189 "com.example.foo",
187 MSE, 190 MSE,
188 kEmeNotSupportedError); 191 kEmeNotSupportedError);
189 } 192 }
190 193
191 } // namespace content 194 } // 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