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

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

Issue 24579003: Clean up remaining unused globals (on mac). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: staticmedia Created 7 years, 2 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
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/path_service.h" 6 #include "base/path_service.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "base/win/windows_version.h" 8 #include "base/win/windows_version.h"
9 #include "chrome/browser/media/media_browsertest.h" 9 #include "chrome/browser/media/media_browsertest.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
(...skipping 13 matching lines...) Expand all
24 #if defined(OS_MACOSX) 24 #if defined(OS_MACOSX)
25 "clearkeycdmadapter.plugin"; 25 "clearkeycdmadapter.plugin";
26 #elif defined(OS_WIN) 26 #elif defined(OS_WIN)
27 "clearkeycdmadapter.dll"; 27 "clearkeycdmadapter.dll";
28 #elif defined(OS_POSIX) 28 #elif defined(OS_POSIX)
29 "libclearkeycdmadapter.so"; 29 "libclearkeycdmadapter.so";
30 #endif 30 #endif
31 #endif // defined(ENABLE_PEPPER_CDMS) 31 #endif // defined(ENABLE_PEPPER_CDMS)
32 32
33 // Available key systems. 33 // Available key systems.
34 static const char kClearKeyKeySystem[] = "webkit-org.w3.clearkey"; 34 const char kClearKeyKeySystem[] = "webkit-org.w3.clearkey";
35 static const char kExternalClearKeyKeySystem[] = 35 const char kExternalClearKeyKeySystem[] =
36 "org.chromium.externalclearkey"; 36 "org.chromium.externalclearkey";
37 37
38 // Supported media types. 38 // Supported media types.
39 static const char kWebMAudioOnly[] = "audio/webm; codecs=\"vorbis\""; 39 const char kWebMAudioOnly[] = "audio/webm; codecs=\"vorbis\"";
40 static const char kWebMVideoOnly[] = "video/webm; codecs=\"vp8\""; 40 const char kWebMVideoOnly[] = "video/webm; codecs=\"vp8\"";
41 static const char kWebMAudioVideo[] = "video/webm; codecs=\"vorbis, vp8\""; 41 const char kWebMAudioVideo[] = "video/webm; codecs=\"vorbis, vp8\"";
42 static const char kMP4AudioOnly[] = "audio/mp4; codecs=\"mp4a.40.2\""; 42 #if defined(USE_PROPRIETARY_CODECS)
43 static const char kMP4VideoOnly[] = "video/mp4; codecs=\"avc1.4D4041\""; 43 const char kMP4AudioOnly[] = "audio/mp4; codecs=\"mp4a.40.2\"";
44 const char kMP4VideoOnly[] = "video/mp4; codecs=\"avc1.4D4041\"";
45 #endif // defined(USE_PROPRIETARY_CODECS)
44 46
45 // EME-specific test results and errors. 47 // EME-specific test results and errors.
46 static const char kEmeGkrException[] = "GENERATE_KEY_REQUEST_EXCEPTION"; 48 const char kEmeGkrException[] = "GENERATE_KEY_REQUEST_EXCEPTION";
47 static const char kEmeKeyError[] = "KEYERROR"; 49 const char kEmeKeyError[] = "KEYERROR";
48 50
49 // The type of video src used to load media. 51 // The type of video src used to load media.
50 enum SrcType { 52 enum SrcType {
51 SRC, 53 SRC,
52 MSE 54 MSE
53 }; 55 };
54 56
55 // Tests encrypted media playback with a combination of parameters: 57 // Tests encrypted media playback with a combination of parameters:
56 // - char*: Key system name. 58 // - char*: Key system name.
57 // - bool: True to load media using MSE, otherwise use src. 59 // - bool: True to load media using MSE, otherwise use src.
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 TestMSESimplePlayback("bear-640x360-v_frag-cenc.mp4", kMP4VideoOnly, 313 TestMSESimplePlayback("bear-640x360-v_frag-cenc.mp4", kMP4VideoOnly,
312 kWidevineKeySystem); 314 kWidevineKeySystem);
313 } 315 }
314 316
315 IN_PROC_BROWSER_TEST_F(WVEncryptedMediaTest, Playback_AudioOnly_MP4) { 317 IN_PROC_BROWSER_TEST_F(WVEncryptedMediaTest, Playback_AudioOnly_MP4) {
316 TestMSESimplePlayback("bear-640x360-a_frag-cenc.mp4", kMP4AudioOnly, 318 TestMSESimplePlayback("bear-640x360-a_frag-cenc.mp4", kMP4AudioOnly,
317 kWidevineKeySystem); 319 kWidevineKeySystem);
318 } 320 }
319 #endif // defined(USE_PROPRIETARY_CODECS) 321 #endif // defined(USE_PROPRIETARY_CODECS)
320 #endif // defined(WIDEVINE_CDM_AVAILABLE) 322 #endif // defined(WIDEVINE_CDM_AVAILABLE)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698