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

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

Issue 230413003: Adding platform specific checks for VP9 codecs and HLS mime types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Adding comments Created 6 years, 7 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 | net/base/mime_util.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <string> 5 #include <string>
6 6
7 #include "content/browser/media/media_browsertest.h" 7 #include "content/browser/media/media_browsertest.h"
8 #include "content/public/test/browser_test_utils.h" 8 #include "content/public/test/browser_test_utils.h"
9 #include "content/public/test/content_browser_test_utils.h" 9 #include "content/public/test/content_browser_test_utils.h"
10 #include "content/shell/browser/shell.h" 10 #include "content/shell/browser/shell.h"
11 11
12 #if defined(OS_ANDROID)
13 #include "base/android/build_info.h"
14 #endif
15
12 const char* kProbably = "probably"; 16 const char* kProbably = "probably";
13 const char* kMaybe = "maybe"; 17 const char* kMaybe = "maybe";
14 const char* kNot = ""; 18 const char* kNot = "";
15 19
16 #if defined(USE_PROPRIETARY_CODECS) 20 #if defined(USE_PROPRIETARY_CODECS)
17 const char* kPropProbably = "probably"; 21 const char* kPropProbably = "probably";
18 const char* kPropMaybe = "maybe"; 22 const char* kPropMaybe = "maybe";
19 #else 23 #else
20 const char* kPropProbably = ""; 24 const char* kPropProbably = "";
21 const char* kPropMaybe = ""; 25 const char* kPropMaybe = "";
22 #endif // USE_PROPRIETARY_CODECS 26 #endif // USE_PROPRIETARY_CODECS
23 27
24 // TODO(amogh.bihani): Change the opus tests when opus is on 28 // TODO(amogh.bihani): Change the opus tests when opus is on
25 // Android. (http://crbug.com/318436). 29 // Android. (http://crbug.com/318436).
26 #if !defined(OS_ANDROID) 30 #if !defined(OS_ANDROID)
27 const char* kOggVideoProbably = "probably"; 31 const char* kOggVideoProbably = "probably";
28 const char* kOggVideoMaybe = "maybe"; 32 const char* kOggVideoMaybe = "maybe";
29 const char* kTheoraProbably = "probably"; 33 const char* kTheoraProbably = "probably";
30 const char* kOpusProbably = "probably"; 34 const char* kOpusProbably = "probably";
31 const char* kOpusProbablyElseMaybe = "probably";
32 const char* kHLSProbably = "";
33 const char* kHLSMaybe = "";
34 #if defined(USE_PROPRIETARY_CODECS) 35 #if defined(USE_PROPRIETARY_CODECS)
35 const char* kTheoraAndPropProbably = "probably"; 36 const char* kTheoraAndPropProbably = "probably";
36 const char* kOpusAndPropProbably = "probably"; 37 const char* kOpusAndPropProbably = "probably";
37 #else 38 #else
38 const char* kTheoraAndPropProbably = ""; 39 const char* kTheoraAndPropProbably = "";
39 const char* kOpusAndPropProbably = ""; 40 const char* kOpusAndPropProbably = "";
40 #endif // USE_PROPRIETARY_CODECS 41 #endif // USE_PROPRIETARY_CODECS
41 #else 42 #else
42 const char* kOggVideoProbably = ""; 43 const char* kOggVideoProbably = "";
43 const char* kOggVideoMaybe = ""; 44 const char* kOggVideoMaybe = "";
44 const char* kTheoraProbably = "maybe"; 45 const char* kTheoraProbably = "";
45 const char* kOpusProbably = ""; 46 const char* kOpusProbably = "";
46 const char* kOpusProbablyElseMaybe = "maybe";
47 const char* kTheoraAndPropProbably = "maybe"; 47 const char* kTheoraAndPropProbably = "maybe";
48 const char* kOpusAndPropProbably = "maybe"; 48 const char* kOpusAndPropProbably = "maybe";
49 const char* kHLSProbably = "probably";
50 const char* kHLSMaybe = "maybe";
51 #endif // !OS_ANDROID 49 #endif // !OS_ANDROID
52 50
53 namespace content { 51 namespace content {
54 52
55 class MediaCanPlayTypeTest : public MediaBrowserTest { 53 class MediaCanPlayTypeTest : public MediaBrowserTest {
56 public: 54 public:
57 MediaCanPlayTypeTest() : url_("about:blank") { } 55 MediaCanPlayTypeTest() : url_("about:blank") { }
58 56
59 virtual void SetUpOnMainThread() OVERRIDE { 57 virtual void SetUpOnMainThread() OVERRIDE {
60 NavigateToURL(shell(), url_); 58 NavigateToURL(shell(), url_);
(...skipping 10 matching lines...) Expand all
71 "window.domAutomationController.send(" + command + ");", 69 "window.domAutomationController.send(" + command + ");",
72 &result)); 70 &result));
73 return result; 71 return result;
74 } 72 }
75 73
76 private: 74 private:
77 GURL url_; 75 GURL url_;
78 DISALLOW_COPY_AND_ASSIGN(MediaCanPlayTypeTest); 76 DISALLOW_COPY_AND_ASSIGN(MediaCanPlayTypeTest);
79 }; 77 };
80 78
81 // TODO(amogh.bihani): http://crbug.com/357665
82 #if !defined(OS_ANDROID)
83
84 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_wav) { 79 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_wav) {
85 EXPECT_EQ(kMaybe, CanPlay("'audio/wav'")); 80 EXPECT_EQ(kMaybe, CanPlay("'audio/wav'"));
86 EXPECT_EQ(kProbably, CanPlay("'audio/wav; codecs=\"1\"'")); 81 EXPECT_EQ(kProbably, CanPlay("'audio/wav; codecs=\"1\"'"));
87 82
88 EXPECT_EQ(kNot, CanPlay("'audio/wav; codecs=\"vorbis\"'")); 83 EXPECT_EQ(kNot, CanPlay("'audio/wav; codecs=\"vorbis\"'"));
89 EXPECT_EQ(kNot, CanPlay("'audio/wav; codecs=\"theora\"'")); 84 EXPECT_EQ(kNot, CanPlay("'audio/wav; codecs=\"theora\"'"));
90 85
91 EXPECT_EQ(kNot, CanPlay("'audio/wav; codecs=\"vp8\"'")); 86 EXPECT_EQ(kNot, CanPlay("'audio/wav; codecs=\"vp8\"'"));
92 EXPECT_EQ(kNot, CanPlay("'audio/wav; codecs=\"vp8.0\"'")); 87 EXPECT_EQ(kNot, CanPlay("'audio/wav; codecs=\"vp8.0\"'"));
93 EXPECT_EQ(kNot, CanPlay("'audio/wav; codecs=\"vp9\"'")); 88 EXPECT_EQ(kNot, CanPlay("'audio/wav; codecs=\"vp9\"'"));
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 EXPECT_EQ(kNot, CanPlay("'audio/x-wav; codecs=\"1, theora\"'")); 130 EXPECT_EQ(kNot, CanPlay("'audio/x-wav; codecs=\"1, theora\"'"));
136 EXPECT_EQ(kNot, CanPlay("'audio/x-wav; codecs=\"1, vorbis\"'")); 131 EXPECT_EQ(kNot, CanPlay("'audio/x-wav; codecs=\"1, vorbis\"'"));
137 EXPECT_EQ(kNot, CanPlay("'audio/x-wav; codecs=\"opus, vorbis\"'")); 132 EXPECT_EQ(kNot, CanPlay("'audio/x-wav; codecs=\"opus, vorbis\"'"));
138 EXPECT_EQ(kNot, CanPlay("'audio/x-wav; codecs=\"opus, theora\"'")); 133 EXPECT_EQ(kNot, CanPlay("'audio/x-wav; codecs=\"opus, theora\"'"));
139 EXPECT_EQ(kNot, CanPlay("'audio/x-wav; codecs=\"vorbis, mp4a\"'")); 134 EXPECT_EQ(kNot, CanPlay("'audio/x-wav; codecs=\"vorbis, mp4a\"'"));
140 135
141 EXPECT_EQ(kNot, CanPlay("'audio/x-wav; codecs=\"unknown\"'")); 136 EXPECT_EQ(kNot, CanPlay("'audio/x-wav; codecs=\"unknown\"'"));
142 } 137 }
143 138
144 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_webm) { 139 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_webm) {
140 // On Android, VP9 is supported only on KitKat and above (API level 19).
141 std::string VP9Probably = "probably";
142 std::string VP9AndOpusProbably = "probably";
143 #if defined(OS_ANDROID)
144 VP9AndOpusProbably = "";
145 if (base::android::BuildInfo::GetInstance()->sdk_int() < 19)
146 VP9Probably = "";
147 #endif
145 EXPECT_EQ(kMaybe, CanPlay("'video/webm'")); 148 EXPECT_EQ(kMaybe, CanPlay("'video/webm'"));
146 149
147 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp8\"'")); 150 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp8\"'"));
148 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp8.0\"'")); 151 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp8.0\"'"));
149 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp8, vorbis\"'")); 152 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp8, vorbis\"'"));
150 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp8.0, vorbis\"'")); 153 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp8.0, vorbis\"'"));
151 EXPECT_EQ(kOpusProbably, CanPlay("'video/webm; codecs=\"vp8, opus\"'")); 154 EXPECT_EQ(kOpusProbably, CanPlay("'video/webm; codecs=\"vp8, opus\"'"));
152 EXPECT_EQ(kOpusProbably, CanPlay("'video/webm; codecs=\"vp8.0, opus\"'")); 155 EXPECT_EQ(kOpusProbably, CanPlay("'video/webm; codecs=\"vp8.0, opus\"'"));
153 156
154 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp9\"'")); 157 EXPECT_EQ(VP9Probably, CanPlay("'video/webm; codecs=\"vp9\"'"));
155 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp9.0\"'")); 158 EXPECT_EQ(VP9Probably, CanPlay("'video/webm; codecs=\"vp9.0\"'"));
156 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp9, vorbis\"'")); 159 EXPECT_EQ(VP9Probably, CanPlay("'video/webm; codecs=\"vp9, vorbis\"'"));
157 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp9.0, vorbis\"'")); 160 EXPECT_EQ(VP9Probably, CanPlay("'video/webm; codecs=\"vp9.0, vorbis\"'"));
158 EXPECT_EQ(kOpusProbably, CanPlay("'video/webm; codecs=\"vp9, opus\"'")); 161 EXPECT_EQ(VP9AndOpusProbably, CanPlay("'video/webm; codecs=\"vp9, opus\"'"));
159 EXPECT_EQ(kOpusProbably, CanPlay("'video/webm; codecs=\"vp9.0, opus\"'")); 162 EXPECT_EQ(VP9AndOpusProbably,
163 CanPlay("'video/webm; codecs=\"vp9.0, opus\"'"));
160 164
161 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp8, vp9\"'")); 165 EXPECT_EQ(VP9Probably, CanPlay("'video/webm; codecs=\"vp8, vp9\"'"));
162 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp8.0, vp9.0\"'")); 166 EXPECT_EQ(VP9Probably, CanPlay("'video/webm; codecs=\"vp8.0, vp9.0\"'"));
163 EXPECT_EQ(kNot, CanPlay("'video/webm; codecs=\"vp8, theora\"'")); 167 EXPECT_EQ(kNot, CanPlay("'video/webm; codecs=\"vp8, theora\"'"));
164 EXPECT_EQ(kNot, CanPlay("'video/webm; codecs=\"vp8, avc1\"'")); 168 EXPECT_EQ(kNot, CanPlay("'video/webm; codecs=\"vp8, avc1\"'"));
165 EXPECT_EQ(kNot, CanPlay("'video/webm; codecs=\"vp9, avc3\"'")); 169 EXPECT_EQ(kNot, CanPlay("'video/webm; codecs=\"vp9, avc3\"'"));
166 170
167 EXPECT_EQ(kNot, CanPlay("'video/webm; codecs=\"vp8, 1\"'")); 171 EXPECT_EQ(kNot, CanPlay("'video/webm; codecs=\"vp8, 1\"'"));
168 EXPECT_EQ(kNot, CanPlay("'video/webm; codecs=\"vp8.0, 1\"'")); 172 EXPECT_EQ(kNot, CanPlay("'video/webm; codecs=\"vp8.0, 1\"'"));
169 EXPECT_EQ(kNot, CanPlay("'video/webm; codecs=\"vp8, mp4a.40.2\"'")); 173 EXPECT_EQ(kNot, CanPlay("'video/webm; codecs=\"vp8, mp4a.40.2\"'"));
170 EXPECT_EQ(kNot, CanPlay("'video/webm; codecs=\"vp8.0, mp4a.40.2\"'")); 174 EXPECT_EQ(kNot, CanPlay("'video/webm; codecs=\"vp8.0, mp4a.40.2\"'"));
171 175
172 EXPECT_EQ(kNot, CanPlay("'video/webm; codecs=\"vp9, 1\"'")); 176 EXPECT_EQ(kNot, CanPlay("'video/webm; codecs=\"vp9, 1\"'"));
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 EXPECT_EQ(kNot, CanPlay("'video/ogg; codecs=\"Theora\"'")); 271 EXPECT_EQ(kNot, CanPlay("'video/ogg; codecs=\"Theora\"'"));
268 EXPECT_EQ(kNot, CanPlay("'video/ogg; codecs=\"Opus\"'")); 272 EXPECT_EQ(kNot, CanPlay("'video/ogg; codecs=\"Opus\"'"));
269 EXPECT_EQ(kNot, CanPlay("'video/ogg; codecs=\"Vorbis\"'")); 273 EXPECT_EQ(kNot, CanPlay("'video/ogg; codecs=\"Vorbis\"'"));
270 EXPECT_EQ(kNot, CanPlay("'video/ogg; codecs=\"Theora, Opus\"'")); 274 EXPECT_EQ(kNot, CanPlay("'video/ogg; codecs=\"Theora, Opus\"'"));
271 EXPECT_EQ(kNot, CanPlay("'video/ogg; codecs=\"Theora, Vorbis\"'")); 275 EXPECT_EQ(kNot, CanPlay("'video/ogg; codecs=\"Theora, Vorbis\"'"));
272 276
273 EXPECT_EQ(kNot, CanPlay("'video/ogg; codecs=\"unknown\"'")); 277 EXPECT_EQ(kNot, CanPlay("'video/ogg; codecs=\"unknown\"'"));
274 278
275 EXPECT_EQ(kMaybe, CanPlay("'audio/ogg'")); 279 EXPECT_EQ(kMaybe, CanPlay("'audio/ogg'"));
276 EXPECT_EQ(kProbably, CanPlay("'audio/ogg; codecs=\"vorbis\"'")); 280 EXPECT_EQ(kProbably, CanPlay("'audio/ogg; codecs=\"vorbis\"'"));
277 EXPECT_EQ(kOpusProbablyElseMaybe, CanPlay("'audio/ogg; codecs=\"opus\"'")); 281 EXPECT_EQ(kOpusProbably, CanPlay("'audio/ogg; codecs=\"opus\"'"));
278 EXPECT_EQ(kOpusProbablyElseMaybe, 282 EXPECT_EQ(kOpusProbably, CanPlay("'audio/ogg; codecs=\"vorbis, opus\"'"));
279 CanPlay("'audio/ogg; codecs=\"vorbis, opus\"'"));
280 283
281 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"theora\"'")); 284 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"theora\"'"));
282 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"theora, vorbis\"'")); 285 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"theora, vorbis\"'"));
283 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"theora, opus\"'")); 286 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"theora, opus\"'"));
284 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"opus, 1\"'")); 287 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"opus, 1\"'"));
285 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"vorbis, 1\"'")); 288 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"vorbis, 1\"'"));
286 289
287 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"vp8\"'")); 290 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"vp8\"'"));
288 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"vp8.0\"'")); 291 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"vp8.0\"'"));
289 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"vp9\"'")); 292 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"vp9\"'"));
(...skipping 10 matching lines...) Expand all
300 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"Opus\"'")); 303 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"Opus\"'"));
301 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"Vorbis\"'")); 304 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"Vorbis\"'"));
302 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"Theora, Vorbis\"'")); 305 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"Theora, Vorbis\"'"));
303 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"Theora, Opus\"'")); 306 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"Theora, Opus\"'"));
304 307
305 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"unknown\"'")); 308 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"unknown\"'"));
306 309
307 EXPECT_EQ(kMaybe, CanPlay("'application/ogg'")); 310 EXPECT_EQ(kMaybe, CanPlay("'application/ogg'"));
308 EXPECT_EQ(kProbably, CanPlay("'application/ogg; codecs=\"vorbis\"'")); 311 EXPECT_EQ(kProbably, CanPlay("'application/ogg; codecs=\"vorbis\"'"));
309 EXPECT_EQ(kTheoraProbably, CanPlay("'application/ogg; codecs=\"theora\"'")); 312 EXPECT_EQ(kTheoraProbably, CanPlay("'application/ogg; codecs=\"theora\"'"));
310 EXPECT_EQ(kOpusProbablyElseMaybe, 313 EXPECT_EQ(kOpusProbably, CanPlay("'application/ogg; codecs=\"opus\"'"));
311 CanPlay("'application/ogg; codecs=\"opus\"'"));
312 EXPECT_EQ(kTheoraProbably, 314 EXPECT_EQ(kTheoraProbably,
313 CanPlay("'application/ogg; codecs=\"theora, vorbis\"'")); 315 CanPlay("'application/ogg; codecs=\"theora, vorbis\"'"));
314 EXPECT_EQ(kTheoraProbably, 316 EXPECT_EQ(kTheoraProbably,
315 CanPlay("'application/ogg; codecs=\"theora, opus\"'")); 317 CanPlay("'application/ogg; codecs=\"theora, opus\"'"));
316 EXPECT_EQ(kOpusProbablyElseMaybe, 318 EXPECT_EQ(kOpusProbably,
317 CanPlay("'application/ogg; codecs=\"opus, vorbis\"'")); 319 CanPlay("'application/ogg; codecs=\"opus, vorbis\"'"));
318 320
319 EXPECT_EQ(kNot, CanPlay("'application/ogg; codecs=\"vp8\"'")); 321 EXPECT_EQ(kNot, CanPlay("'application/ogg; codecs=\"vp8\"'"));
320 EXPECT_EQ(kNot, CanPlay("'application/ogg; codecs=\"vp8.0\"'")); 322 EXPECT_EQ(kNot, CanPlay("'application/ogg; codecs=\"vp8.0\"'"));
321 EXPECT_EQ(kNot, CanPlay("'application/ogg; codecs=\"vp9\"'")); 323 EXPECT_EQ(kNot, CanPlay("'application/ogg; codecs=\"vp9\"'"));
322 EXPECT_EQ(kNot, CanPlay("'application/ogg; codecs=\"vp9.0\"'")); 324 EXPECT_EQ(kNot, CanPlay("'application/ogg; codecs=\"vp9.0\"'"));
323 325
324 EXPECT_EQ(kNot, CanPlay("'application/ogg; codecs=\"avc1\"'")); 326 EXPECT_EQ(kNot, CanPlay("'application/ogg; codecs=\"avc1\"'"));
325 EXPECT_EQ(kNot, CanPlay("'application/ogg; codecs=\"avc3\"'")); 327 EXPECT_EQ(kNot, CanPlay("'application/ogg; codecs=\"avc3\"'"));
326 EXPECT_EQ(kNot, CanPlay("'application/ogg; codecs=\"mp4a\"'")); 328 EXPECT_EQ(kNot, CanPlay("'application/ogg; codecs=\"mp4a\"'"));
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 EXPECT_EQ(kNot, CanPlay("'audio/x-mp3; codecs=\"avc4\"'")); 493 EXPECT_EQ(kNot, CanPlay("'audio/x-mp3; codecs=\"avc4\"'"));
492 494
493 EXPECT_EQ(kNot, CanPlay("'audio/x-mp3; codecs=\"avc1x\"'")); 495 EXPECT_EQ(kNot, CanPlay("'audio/x-mp3; codecs=\"avc1x\"'"));
494 EXPECT_EQ(kNot, CanPlay("'audio/x-mp3; codecs=\"avc3x\"'")); 496 EXPECT_EQ(kNot, CanPlay("'audio/x-mp3; codecs=\"avc3x\"'"));
495 EXPECT_EQ(kNot, CanPlay("'audio/x-mp3; codecs=\"mp4ax\"'")); 497 EXPECT_EQ(kNot, CanPlay("'audio/x-mp3; codecs=\"mp4ax\"'"));
496 498
497 EXPECT_EQ(kNot, CanPlay("'audio/x-mp3; codecs=\"unknown\"'")); 499 EXPECT_EQ(kNot, CanPlay("'audio/x-mp3; codecs=\"unknown\"'"));
498 } 500 }
499 501
500 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp4) { 502 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp4) {
503 // TODO(amogh.bihani): Change this expectation when bug 53193 is fixed.
504 std::string PropAndVP9Probably = "";
505 #if defined (OS_ANDROID)
506 if (base::android::BuildInfo::GetInstance()->sdk_int() < 19)
507 PropAndVP9Probably = "maybe";
508 else
509 PropAndVP9Probably = "probably";
510 #else
511 #if defined(USE_PROPRIETARY_CODECS)
512 PropAndVP9Probably = "probably";
513 #endif // USE_PROPRIETARY_CODECS
514 #endif // OS_ANDROID
501 EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4'")); 515 EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4'"));
502 516
503 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1\"'")); 517 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1\"'"));
504 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3\"'")); 518 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3\"'"));
505 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"mp4a\"'")); 519 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"mp4a\"'"));
506 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1, mp4a\"'")); 520 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1, mp4a\"'"));
507 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3, mp4a\"'")); 521 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3, mp4a\"'"));
508 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1, avc3\"'")); 522 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1, avc3\"'"));
509 523
510 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1.4D401E\"'")); 524 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1.4D401E\"'"));
511 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.64001F\"'")); 525 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.64001F\"'"));
512 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"mp4a.40.2\"'")); 526 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"mp4a.40.2\"'"));
513 EXPECT_EQ(kPropProbably, 527 EXPECT_EQ(kPropProbably,
514 CanPlay("'video/mp4; codecs=\"avc1.4D401E, mp4a.40.2\"'")); 528 CanPlay("'video/mp4; codecs=\"avc1.4D401E, mp4a.40.2\"'"));
515 EXPECT_EQ(kPropProbably, 529 EXPECT_EQ(kPropProbably,
516 CanPlay("'video/mp4; codecs=\"avc3.64001F, mp4a.40.5\"'")); 530 CanPlay("'video/mp4; codecs=\"avc3.64001F, mp4a.40.5\"'"));
517 531
518 // TODO(amogh.bihani): Change these tests when bug 53193 is fixed. 532 // TODO(amogh.bihani): Change these tests when bug 53193 is fixed.
519 // http://crbug.com/53193 ---------------------------------------------------- 533 // http://crbug.com/53193 ----------------------------------------------------
520 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1.unknown\"'")); 534 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1.unknown\"'"));
521 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.unknown\"'")); 535 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.unknown\"'"));
522 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"mp4a.unknown\"'")); 536 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"mp4a.unknown\"'"));
523 537
524 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1.\"'")); 538 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1.\"'"));
525 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.\"'")); 539 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.\"'"));
526 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"mp4a.\"'")); 540 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"mp4a.\"'"));
527 541
528 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"vp8\"'")); 542 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"vp8\"'"));
529 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"vp9\"'")); 543 EXPECT_EQ(PropAndVP9Probably, CanPlay("'video/mp4; codecs=\"vp9\"'"));
530 544
531 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"vorbis\"'")); 545 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"vorbis\"'"));
532 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1, vorbis\"'")); 546 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1, vorbis\"'"));
533 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3, vorbis\"'")); 547 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3, vorbis\"'"));
534 EXPECT_EQ(kPropProbably, 548 EXPECT_EQ(kPropProbably,
535 CanPlay("'video/mp4; codecs=\"avc1.4D401E, vorbis\"'")); 549 CanPlay("'video/mp4; codecs=\"avc1.4D401E, vorbis\"'"));
536 EXPECT_EQ(kPropProbably, 550 EXPECT_EQ(kPropProbably,
537 CanPlay("'video/mp4; codecs=\"avc3.64001F, vorbis\"'")); 551 CanPlay("'video/mp4; codecs=\"avc3.64001F, vorbis\"'"));
538 552
539 EXPECT_EQ(kOpusAndPropProbably, CanPlay("'video/mp4; codecs=\"opus\"'")); 553 EXPECT_EQ(kOpusAndPropProbably, CanPlay("'video/mp4; codecs=\"opus\"'"));
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 // http://crbug.com/53193 ---------------------------------------------------- 614 // http://crbug.com/53193 ----------------------------------------------------
601 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc1.unknown\"'")); 615 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc1.unknown\"'"));
602 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc3.unknown\"'")); 616 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc3.unknown\"'"));
603 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"mp4a.unknown\"'")); 617 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"mp4a.unknown\"'"));
604 618
605 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc1.\"'")); 619 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc1.\"'"));
606 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc3.\"'")); 620 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc3.\"'"));
607 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"mp4a.\"'")); 621 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"mp4a.\"'"));
608 622
609 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"vp8\"'")); 623 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"vp8\"'"));
610 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"vp9\"'")); 624 EXPECT_EQ(PropAndVP9Probably, CanPlay("'video/x-m4v; codecs=\"vp9\"'"));
611 625
612 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"vorbis\"'")); 626 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"vorbis\"'"));
613 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc1, vorbis\"'")); 627 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc1, vorbis\"'"));
614 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc3, vorbis\"'")); 628 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc3, vorbis\"'"));
615 EXPECT_EQ(kPropProbably, 629 EXPECT_EQ(kPropProbably,
616 CanPlay("'video/x-m4v; codecs=\"avc1.4D401E, vorbis\"'")); 630 CanPlay("'video/x-m4v; codecs=\"avc1.4D401E, vorbis\"'"));
617 EXPECT_EQ(kPropProbably, 631 EXPECT_EQ(kPropProbably,
618 CanPlay("'video/x-m4v; codecs=\"avc3.64001F, vorbis\"'")); 632 CanPlay("'video/x-m4v; codecs=\"avc3.64001F, vorbis\"'"));
619 633
620 EXPECT_EQ(kOpusAndPropProbably, CanPlay("'video/x-m4v; codecs=\"opus\"'")); 634 EXPECT_EQ(kOpusAndPropProbably, CanPlay("'video/x-m4v; codecs=\"opus\"'"));
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
691 CanPlay("'audio/mp4; codecs=\"avc3.64001F mp4a.40.2\"'")); 705 CanPlay("'audio/mp4; codecs=\"avc3.64001F mp4a.40.2\"'"));
692 EXPECT_EQ(kPropProbably, 706 EXPECT_EQ(kPropProbably,
693 CanPlay("'audio/mp4; codecs=\"mp4a, vorbis\"'")); 707 CanPlay("'audio/mp4; codecs=\"mp4a, vorbis\"'"));
694 EXPECT_EQ(kPropProbably, 708 EXPECT_EQ(kPropProbably,
695 CanPlay("'audio/mp4; codecs=\"mp4a.40.2, vorbis\"'")); 709 CanPlay("'audio/mp4; codecs=\"mp4a.40.2, vorbis\"'"));
696 710
697 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"vorbis\"'")); 711 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"vorbis\"'"));
698 712
699 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"vp8\"'")); 713 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"vp8\"'"));
700 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"vp8.0\"'")); 714 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"vp8.0\"'"));
701 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"vp9\"'")); 715 EXPECT_EQ(PropAndVP9Probably, CanPlay("'audio/mp4; codecs=\"vp9\"'"));
702 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"vp9.0\"'")); 716 EXPECT_EQ(PropAndVP9Probably, CanPlay("'audio/mp4; codecs=\"vp9.0\"'"));
703 717
704 EXPECT_EQ(kOpusAndPropProbably, CanPlay("'audio/mp4; codecs=\"opus\"'")); 718 EXPECT_EQ(kOpusAndPropProbably, CanPlay("'audio/mp4; codecs=\"opus\"'"));
705 EXPECT_EQ(kOpusAndPropProbably, 719 EXPECT_EQ(kOpusAndPropProbably,
706 CanPlay("'audio/mp4; codecs=\"mp4a, opus\"'")); 720 CanPlay("'audio/mp4; codecs=\"mp4a, opus\"'"));
707 EXPECT_EQ(kOpusAndPropProbably, 721 EXPECT_EQ(kOpusAndPropProbably,
708 CanPlay("'audio/mp4; codecs=\"vorbis, opus\"'")); 722 CanPlay("'audio/mp4; codecs=\"vorbis, opus\"'"));
709 EXPECT_EQ(kOpusAndPropProbably, CanPlay("'audio/mp4; codecs=\"vp8, opus\"'")); 723 EXPECT_EQ(kOpusAndPropProbably, CanPlay("'audio/mp4; codecs=\"vp8, opus\"'"));
710 EXPECT_EQ(kOpusAndPropProbably, CanPlay("'audio/mp4; codecs=\"vp9, opus\"'")); 724 EXPECT_EQ(kOpusAndPropProbably, CanPlay("'audio/mp4; codecs=\"vp9, opus\"'"));
711 725
712 EXPECT_EQ(kTheoraAndPropProbably, CanPlay("'audio/mp4; codecs=\"theora\"'")); 726 EXPECT_EQ(kTheoraAndPropProbably, CanPlay("'audio/mp4; codecs=\"theora\"'"));
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
767 CanPlay("'audio/x-m4a; codecs=\"avc3.64001F mp4a.40.2\"'")); 781 CanPlay("'audio/x-m4a; codecs=\"avc3.64001F mp4a.40.2\"'"));
768 EXPECT_EQ(kPropProbably, 782 EXPECT_EQ(kPropProbably,
769 CanPlay("'audio/x-m4a; codecs=\"mp4a, vorbis\"'")); 783 CanPlay("'audio/x-m4a; codecs=\"mp4a, vorbis\"'"));
770 EXPECT_EQ(kPropProbably, 784 EXPECT_EQ(kPropProbably,
771 CanPlay("'audio/x-m4a; codecs=\"mp4a.40.2, vorbis\"'")); 785 CanPlay("'audio/x-m4a; codecs=\"mp4a.40.2, vorbis\"'"));
772 786
773 EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"vorbis\"'")); 787 EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"vorbis\"'"));
774 788
775 EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"vp8\"'")); 789 EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"vp8\"'"));
776 EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"vp8.0\"'")); 790 EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"vp8.0\"'"));
777 EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"vp9\"'")); 791 EXPECT_EQ(PropAndVP9Probably, CanPlay("'audio/x-m4a; codecs=\"vp9\"'"));
778 EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"vp9.0\"'")); 792 EXPECT_EQ(PropAndVP9Probably, CanPlay("'audio/x-m4a; codecs=\"vp9.0\"'"));
779 793
780 EXPECT_EQ(kOpusAndPropProbably, CanPlay("'audio/x-m4a; codecs=\"opus\"'")); 794 EXPECT_EQ(kOpusAndPropProbably, CanPlay("'audio/x-m4a; codecs=\"opus\"'"));
781 EXPECT_EQ(kOpusAndPropProbably, 795 EXPECT_EQ(kOpusAndPropProbably,
782 CanPlay("'audio/x-m4a; codecs=\"mp4a, opus\"'")); 796 CanPlay("'audio/x-m4a; codecs=\"mp4a, opus\"'"));
783 EXPECT_EQ(kOpusAndPropProbably, 797 EXPECT_EQ(kOpusAndPropProbably,
784 CanPlay("'audio/x-m4a; codecs=\"vorbis, opus\"'")); 798 CanPlay("'audio/x-m4a; codecs=\"vorbis, opus\"'"));
785 EXPECT_EQ(kOpusAndPropProbably, 799 EXPECT_EQ(kOpusAndPropProbably,
786 CanPlay("'audio/x-m4a; codecs=\"vp8, opus\"'")); 800 CanPlay("'audio/x-m4a; codecs=\"vp8, opus\"'"));
787 EXPECT_EQ(kOpusAndPropProbably, 801 EXPECT_EQ(kOpusAndPropProbably,
788 CanPlay("'audio/x-m4a; codecs=\"vp9, opus\"'")); 802 CanPlay("'audio/x-m4a; codecs=\"vp9, opus\"'"));
(...skipping 24 matching lines...) Expand all
813 827
814 EXPECT_EQ(kPropMaybe, CanPlay("'audio/x-m4a; codecs=\"avc1x\"'")); 828 EXPECT_EQ(kPropMaybe, CanPlay("'audio/x-m4a; codecs=\"avc1x\"'"));
815 EXPECT_EQ(kPropMaybe, CanPlay("'audio/x-m4a; codecs=\"avc3x\"'")); 829 EXPECT_EQ(kPropMaybe, CanPlay("'audio/x-m4a; codecs=\"avc3x\"'"));
816 EXPECT_EQ(kPropMaybe, CanPlay("'audio/x-m4a; codecs=\"mp4ax\"'")); 830 EXPECT_EQ(kPropMaybe, CanPlay("'audio/x-m4a; codecs=\"mp4ax\"'"));
817 831
818 EXPECT_EQ(kPropMaybe, CanPlay("'audio/x-m4a; codecs=\"unknown\"'")); 832 EXPECT_EQ(kPropMaybe, CanPlay("'audio/x-m4a; codecs=\"unknown\"'"));
819 // --------------------------------------------------------------------------- 833 // ---------------------------------------------------------------------------
820 } 834 }
821 835
822 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_HLS) { 836 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_HLS) {
823 EXPECT_EQ(kHLSMaybe, CanPlay("'application/x-mpegurl'")); 837 // HLS are supported only on Android IceCreamSandwich and above (API level 14)
824 838 std::string HLSProbably = "";
825 EXPECT_EQ(kHLSProbably, 839 std::string HLSMaybe = "";
840 std::string HLSAndVP9Probably = "";
841 #if defined(OS_ANDROID)
842 int sdk = base::android::BuildInfo::GetInstance()->sdk_int();
843 if (sdk > 13) {
844 HLSProbably = "probably";
845 HLSMaybe = "maybe";
846 if (sdk < 19)
847 HLSAndVP9Probably = "maybe";
848 else
849 HLSAndVP9Probably = "probably";
850 }
851 #endif
852 EXPECT_EQ(HLSMaybe, CanPlay("'application/x-mpegurl'"));
853
854 EXPECT_EQ(HLSProbably,
826 CanPlay("'application/x-mpegurl; codecs=\"avc1\"'")); 855 CanPlay("'application/x-mpegurl; codecs=\"avc1\"'"));
827 EXPECT_EQ(kHLSProbably, 856 EXPECT_EQ(HLSProbably,
828 CanPlay("'application/x-mpegurl; codecs=\"avc3\"'")); 857 CanPlay("'application/x-mpegurl; codecs=\"avc3\"'"));
829 EXPECT_EQ(kHLSProbably, 858 EXPECT_EQ(HLSProbably,
830 CanPlay("'application/x-mpegurl; codecs=\"mp4a\"'")); 859 CanPlay("'application/x-mpegurl; codecs=\"mp4a\"'"));
831 EXPECT_EQ(kHLSProbably, 860 EXPECT_EQ(HLSProbably,
832 CanPlay("'application/x-mpegurl; codecs=\"avc1, mp4a\"'")); 861 CanPlay("'application/x-mpegurl; codecs=\"avc1, mp4a\"'"));
833 EXPECT_EQ(kHLSProbably, 862 EXPECT_EQ(HLSProbably,
834 CanPlay("'application/x-mpegurl; codecs=\"avc3, mp4a\"'")); 863 CanPlay("'application/x-mpegurl; codecs=\"avc3, mp4a\"'"));
835 864
836 EXPECT_EQ(kHLSProbably, 865 EXPECT_EQ(HLSProbably,
837 CanPlay("'application/x-mpegurl; codecs=\"avc1.4D401E\"'")); 866 CanPlay("'application/x-mpegurl; codecs=\"avc1.4D401E\"'"));
838 EXPECT_EQ(kHLSProbably, 867 EXPECT_EQ(HLSProbably,
839 CanPlay("'application/x-mpegurl; codecs=\"avc3.64001F\"'")); 868 CanPlay("'application/x-mpegurl; codecs=\"avc3.64001F\"'"));
840 EXPECT_EQ(kHLSProbably, 869 EXPECT_EQ(HLSProbably,
841 CanPlay("'application/x-mpegurl; codecs=\"mp4a.40.2\"'")); 870 CanPlay("'application/x-mpegurl; codecs=\"mp4a.40.2\"'"));
842 EXPECT_EQ(kHLSProbably, 871 EXPECT_EQ(HLSProbably,
843 CanPlay("'application/x-mpegurl; codecs=\"avc1.4D401E, mp4a.40.2\"'")); 872 CanPlay("'application/x-mpegurl; codecs=\"avc1.4D401E, mp4a.40.2\"'"));
844 EXPECT_EQ(kHLSProbably, 873 EXPECT_EQ(HLSProbably,
845 CanPlay("'application/x-mpegurl; codecs=\"avc3.64001F, mp4a.40.5\"'")); 874 CanPlay("'application/x-mpegurl; codecs=\"avc3.64001F, mp4a.40.5\"'"));
846 875
847 // TODO(amogh.bihani): Change these tests when bug 53193 is fixed. 876 // TODO(amogh.bihani): Change these tests when bug 53193 is fixed.
848 // http://crbug.com/53193 ---------------------------------------------------- 877 // http://crbug.com/53193 ----------------------------------------------------
849 EXPECT_EQ(kHLSProbably, 878 EXPECT_EQ(HLSProbably,
850 CanPlay("'application/x-mpegurl; codecs=\"avc1.unknown\"'")); 879 CanPlay("'application/x-mpegurl; codecs=\"avc1.unknown\"'"));
851 EXPECT_EQ(kHLSProbably, 880 EXPECT_EQ(HLSProbably,
852 CanPlay("'application/x-mpegurl; codecs=\"avc3.unknown\"'")); 881 CanPlay("'application/x-mpegurl; codecs=\"avc3.unknown\"'"));
853 EXPECT_EQ(kHLSProbably, 882 EXPECT_EQ(HLSProbably,
854 CanPlay("'application/x-mpegurl; codecs=\"mp4a.unknown\"'")); 883 CanPlay("'application/x-mpegurl; codecs=\"mp4a.unknown\"'"));
855 884
856 EXPECT_EQ(kHLSProbably, CanPlay("'application/x-mpegurl; codecs=\"avc1.\"'")); 885 EXPECT_EQ(HLSProbably, CanPlay("'application/x-mpegurl; codecs=\"avc1.\"'"));
857 EXPECT_EQ(kHLSProbably, CanPlay("'application/x-mpegurl; codecs=\"avc3.\"'")); 886 EXPECT_EQ(HLSProbably, CanPlay("'application/x-mpegurl; codecs=\"avc3.\"'"));
858 EXPECT_EQ(kHLSProbably, CanPlay("'application/x-mpegurl; codecs=\"mp4a.\"'")); 887 EXPECT_EQ(HLSProbably, CanPlay("'application/x-mpegurl; codecs=\"mp4a.\"'"));
859 888
860 EXPECT_EQ(kHLSProbably, CanPlay("'application/x-mpegurl; codecs=\"vp8\"'")); 889 EXPECT_EQ(HLSProbably, CanPlay("'application/x-mpegurl; codecs=\"vp8\"'"));
861 EXPECT_EQ(kHLSProbably, CanPlay("'application/x-mpegurl; codecs=\"vp9\"'")); 890 EXPECT_EQ(HLSAndVP9Probably,
862 EXPECT_EQ(kHLSProbably, 891 CanPlay("'application/x-mpegurl; codecs=\"vp9\"'"));
892 EXPECT_EQ(HLSProbably,
863 CanPlay("'application/x-mpegurl; codecs=\"vorbis\"'")); 893 CanPlay("'application/x-mpegurl; codecs=\"vorbis\"'"));
864 894
865 EXPECT_EQ(kHLSProbably, 895 EXPECT_EQ(HLSProbably,
866 CanPlay("'application/x-mpegurl; codecs=\"avc1, vorbis\"'")); 896 CanPlay("'application/x-mpegurl; codecs=\"avc1, vorbis\"'"));
867 EXPECT_EQ(kHLSProbably, 897 EXPECT_EQ(HLSProbably,
868 CanPlay("'application/x-mpegurl; codecs=\"avc3, vorbis\"'")); 898 CanPlay("'application/x-mpegurl; codecs=\"avc3, vorbis\"'"));
869 EXPECT_EQ(kHLSProbably, 899 EXPECT_EQ(HLSProbably,
870 CanPlay("'application/x-mpegurl; codecs=\"avc1.4D401E, vorbis\"'")); 900 CanPlay("'application/x-mpegurl; codecs=\"avc1.4D401E, vorbis\"'"));
871 EXPECT_EQ(kHLSProbably, 901 EXPECT_EQ(HLSProbably,
872 CanPlay("'application/x-mpegurl; codecs=\"avc3.64001F, vorbis\"'")); 902 CanPlay("'application/x-mpegurl; codecs=\"avc3.64001F, vorbis\"'"));
873 903
874 EXPECT_EQ(kHLSMaybe, CanPlay("'application/x-mpegurl; codecs=\"opus\"'")); 904 EXPECT_EQ(HLSMaybe, CanPlay("'application/x-mpegurl; codecs=\"opus\"'"));
875 EXPECT_EQ(kHLSMaybe, 905 EXPECT_EQ(HLSMaybe,
876 CanPlay("'application/x-mpegurl; codecs=\"vp8, opus\"'")); 906 CanPlay("'application/x-mpegurl; codecs=\"vp8, opus\"'"));
877 EXPECT_EQ(kHLSMaybe, 907 EXPECT_EQ(HLSMaybe,
878 CanPlay("'application/x-mpegurl; codecs=\"vp9, opus\"'")); 908 CanPlay("'application/x-mpegurl; codecs=\"vp9, opus\"'"));
879 909
880 EXPECT_EQ(kHLSMaybe, 910 EXPECT_EQ(HLSMaybe,
881 CanPlay("'application/x-mpegurl; codecs=\"theora\"'")); 911 CanPlay("'application/x-mpegurl; codecs=\"theora\"'"));
882 EXPECT_EQ(kHLSMaybe, 912 EXPECT_EQ(HLSMaybe,
883 CanPlay("'application/x-mpegurl; codecs=\"theora, vorbis\"'")); 913 CanPlay("'application/x-mpegurl; codecs=\"theora, vorbis\"'"));
884 EXPECT_EQ(kHLSMaybe, 914 EXPECT_EQ(HLSMaybe,
885 CanPlay("'application/x-mpegurl; codecs=\"theora, mp4a\"'")); 915 CanPlay("'application/x-mpegurl; codecs=\"theora, mp4a\"'"));
886 EXPECT_EQ(kHLSMaybe, 916 EXPECT_EQ(HLSMaybe,
887 CanPlay("'application/x-mpegurl; codecs=\"theora, mp4a.40.2\"'")); 917 CanPlay("'application/x-mpegurl; codecs=\"theora, mp4a.40.2\"'"));
888 918
889 EXPECT_EQ(kHLSMaybe, CanPlay("'application/x-mpegurl; codecs=\"AVC1\"'")); 919 EXPECT_EQ(HLSMaybe, CanPlay("'application/x-mpegurl; codecs=\"AVC1\"'"));
890 EXPECT_EQ(kHLSMaybe, 920 EXPECT_EQ(HLSMaybe,
891 CanPlay("'application/x-mpegurl; codecs=\"AVC1.4d401e\"'")); 921 CanPlay("'application/x-mpegurl; codecs=\"AVC1.4d401e\"'"));
892 EXPECT_EQ(kHLSMaybe, CanPlay("'application/x-mpegurl; codecs=\"AVC3\"'")); 922 EXPECT_EQ(HLSMaybe, CanPlay("'application/x-mpegurl; codecs=\"AVC3\"'"));
893 EXPECT_EQ(kHLSMaybe, 923 EXPECT_EQ(HLSMaybe,
894 CanPlay("'application/x-mpegurl; codecs=\"AVC3.64001f\"'")); 924 CanPlay("'application/x-mpegurl; codecs=\"AVC3.64001f\"'"));
895 EXPECT_EQ(kHLSMaybe, CanPlay("'application/x-mpegurl; codecs=\"MP4A\"'")); 925 EXPECT_EQ(HLSMaybe, CanPlay("'application/x-mpegurl; codecs=\"MP4A\"'"));
896 EXPECT_EQ(kHLSMaybe, 926 EXPECT_EQ(HLSMaybe,
897 CanPlay("'application/x-mpegurl; codecs=\"MP4A.40.2\"'")); 927 CanPlay("'application/x-mpegurl; codecs=\"MP4A.40.2\"'"));
898 EXPECT_EQ(kHLSMaybe, 928 EXPECT_EQ(HLSMaybe,
899 CanPlay("'application/x-mpegurl; codecs=\"AVC1, MP4\"'")); 929 CanPlay("'application/x-mpegurl; codecs=\"AVC1, MP4\"'"));
900 EXPECT_EQ(kHLSMaybe, 930 EXPECT_EQ(HLSMaybe,
901 CanPlay("'application/x-mpegurl; codecs=\"AVC3, MP4\"'")); 931 CanPlay("'application/x-mpegurl; codecs=\"AVC3, MP4\"'"));
902 EXPECT_EQ(kHLSMaybe, 932 EXPECT_EQ(HLSMaybe,
903 CanPlay("'application/x-mpegurl; codecs=\", AVC1.4D401E, MP4.40.2\"'")); 933 CanPlay("'application/x-mpegurl; codecs=\", AVC1.4D401E, MP4.40.2\"'"));
904 EXPECT_EQ(kHLSMaybe, 934 EXPECT_EQ(HLSMaybe,
905 CanPlay("'application/x-mpegurl; codecs=\", AVC3.64001F, MP4.40.2\"'")); 935 CanPlay("'application/x-mpegurl; codecs=\", AVC3.64001F, MP4.40.2\"'"));
906 936
907 EXPECT_EQ(kHLSMaybe, 937 EXPECT_EQ(HLSMaybe,
908 CanPlay("'application/x-mpegurl; codecs=\"avc2\"'")); 938 CanPlay("'application/x-mpegurl; codecs=\"avc2\"'"));
909 EXPECT_EQ(kHLSMaybe, 939 EXPECT_EQ(HLSMaybe,
910 CanPlay("'application/x-mpegurl; codecs=\"avc4\"'")); 940 CanPlay("'application/x-mpegurl; codecs=\"avc4\"'"));
911 941
912 EXPECT_EQ(kHLSMaybe, 942 EXPECT_EQ(HLSMaybe,
913 CanPlay("'application/x-mpegurl; codecs=\"avc1x\"'")); 943 CanPlay("'application/x-mpegurl; codecs=\"avc1x\"'"));
914 EXPECT_EQ(kHLSMaybe, 944 EXPECT_EQ(HLSMaybe,
915 CanPlay("'application/x-mpegurl; codecs=\"avc3x\"'")); 945 CanPlay("'application/x-mpegurl; codecs=\"avc3x\"'"));
916 EXPECT_EQ(kHLSMaybe, 946 EXPECT_EQ(HLSMaybe,
917 CanPlay("'application/x-mpegurl; codecs=\"mp4ax\"'")); 947 CanPlay("'application/x-mpegurl; codecs=\"mp4ax\"'"));
918 948
919 EXPECT_EQ(kHLSMaybe, 949 EXPECT_EQ(HLSMaybe,
920 CanPlay("'application/x-mpegurl; codecs=\"unknown\"'")); 950 CanPlay("'application/x-mpegurl; codecs=\"unknown\"'"));
921 // --------------------------------------------------------------------------- 951 // ---------------------------------------------------------------------------
922 952
923 EXPECT_EQ(kHLSMaybe, CanPlay("'application/vnd.apple.mpegurl'")); 953 EXPECT_EQ(HLSMaybe, CanPlay("'application/vnd.apple.mpegurl'"));
924 954
925 EXPECT_EQ(kHLSProbably, 955 EXPECT_EQ(HLSProbably,
926 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1\"'")); 956 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1\"'"));
927 EXPECT_EQ(kHLSProbably, 957 EXPECT_EQ(HLSProbably,
928 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3\"'")); 958 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3\"'"));
929 EXPECT_EQ(kHLSProbably, 959 EXPECT_EQ(HLSProbably,
930 CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4a\"'")); 960 CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4a\"'"));
931 EXPECT_EQ(kHLSProbably, 961 EXPECT_EQ(HLSProbably,
932 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1, mp4a\"'")); 962 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1, mp4a\"'"));
933 EXPECT_EQ(kHLSProbably, 963 EXPECT_EQ(HLSProbably,
934 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3, mp4a\"'")); 964 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3, mp4a\"'"));
935 965
936 EXPECT_EQ(kHLSProbably, 966 EXPECT_EQ(HLSProbably,
937 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.4D401E\"'")); 967 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.4D401E\"'"));
938 EXPECT_EQ(kHLSProbably, 968 EXPECT_EQ(HLSProbably,
939 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3.64001F\"'")); 969 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3.64001F\"'"));
940 EXPECT_EQ(kHLSProbably, 970 EXPECT_EQ(HLSProbably,
941 CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4a.40.2\"'")); 971 CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4a.40.2\"'"));
942 972
943 // TODO(amogh.bihani): Change these tests when bug 53193 is fixed. 973 // TODO(amogh.bihani): Change these tests when bug 53193 is fixed.
944 // http://crbug.com/53193 ---------------------------------------------------- 974 // http://crbug.com/53193 ----------------------------------------------------
945 EXPECT_EQ(kHLSProbably, 975 EXPECT_EQ(HLSProbably,
946 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.unknown\"'")); 976 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.unknown\"'"));
947 EXPECT_EQ(kHLSProbably, 977 EXPECT_EQ(HLSProbably,
948 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3.unknown\"'")); 978 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3.unknown\"'"));
949 EXPECT_EQ(kHLSProbably, 979 EXPECT_EQ(HLSProbably,
950 CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4a.unknown\"'")); 980 CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4a.unknown\"'"));
951 981
952 EXPECT_EQ(kHLSProbably, 982 EXPECT_EQ(HLSProbably,
953 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.\"'")); 983 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.\"'"));
954 EXPECT_EQ(kHLSProbably, 984 EXPECT_EQ(HLSProbably,
955 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3.\"'")); 985 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3.\"'"));
956 EXPECT_EQ(kHLSProbably, 986 EXPECT_EQ(HLSProbably,
957 CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4a.\"'")); 987 CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4a.\"'"));
958 988
959 EXPECT_EQ(kHLSProbably, 989 EXPECT_EQ(HLSProbably,
960 CanPlay("'application/vnd.apple.mpegurl; codecs=\"vp8\"'")); 990 CanPlay("'application/vnd.apple.mpegurl; codecs=\"vp8\"'"));
961 EXPECT_EQ(kHLSProbably, 991 EXPECT_EQ(HLSAndVP9Probably,
962 CanPlay("'application/vnd.apple.mpegurl; codecs=\"vp9\"'")); 992 CanPlay("'application/vnd.apple.mpegurl; codecs=\"vp9\"'"));
963 EXPECT_EQ(kHLSProbably, 993 EXPECT_EQ(HLSProbably,
964 CanPlay("'application/vnd.apple.mpegurl; codecs=\"vorbis\"'")); 994 CanPlay("'application/vnd.apple.mpegurl; codecs=\"vorbis\"'"));
965 995
966 EXPECT_EQ(kHLSProbably, 996 EXPECT_EQ(HLSProbably,
967 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1, vorbis\"'")); 997 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1, vorbis\"'"));
968 EXPECT_EQ(kHLSProbably, 998 EXPECT_EQ(HLSProbably,
969 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3, vorbis\"'")); 999 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3, vorbis\"'"));
970 EXPECT_EQ(kHLSProbably, 1000 EXPECT_EQ(HLSProbably,
971 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.4D401E, vorbis\"'")); 1001 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.4D401E, vorbis\"'"));
972 EXPECT_EQ(kHLSProbably, 1002 EXPECT_EQ(HLSProbably,
973 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3.64001F, vorbis\"'")); 1003 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3.64001F, vorbis\"'"));
974 1004
975 EXPECT_EQ(kHLSMaybe, 1005 EXPECT_EQ(HLSMaybe,
976 CanPlay("'application/vnd.apple.mpegurl; codecs=\"opus\"'")); 1006 CanPlay("'application/vnd.apple.mpegurl; codecs=\"opus\"'"));
977 EXPECT_EQ(kHLSMaybe, 1007 EXPECT_EQ(HLSMaybe,
978 CanPlay("'application/vnd.apple.mpegurl; codecs=\"vp8, opus\"'")); 1008 CanPlay("'application/vnd.apple.mpegurl; codecs=\"vp8, opus\"'"));
979 EXPECT_EQ(kHLSMaybe, 1009 EXPECT_EQ(HLSMaybe,
980 CanPlay("'application/vnd.apple.mpegurl; codecs=\"vp9, opus\"'")); 1010 CanPlay("'application/vnd.apple.mpegurl; codecs=\"vp9, opus\"'"));
981 1011
982 EXPECT_EQ(kHLSMaybe, 1012 EXPECT_EQ(HLSMaybe,
983 CanPlay("'application/vnd.apple.mpegurl; codecs=\"theora\"'")); 1013 CanPlay("'application/vnd.apple.mpegurl; codecs=\"theora\"'"));
984 EXPECT_EQ(kHLSMaybe, 1014 EXPECT_EQ(HLSMaybe,
985 CanPlay("'application/vnd.apple.mpegurl; codecs=\"theora, vorbis\"'")); 1015 CanPlay("'application/vnd.apple.mpegurl; codecs=\"theora, vorbis\"'"));
986 EXPECT_EQ(kHLSMaybe, 1016 EXPECT_EQ(HLSMaybe,
987 CanPlay("'application/vnd.apple.mpegurl; codecs=\"theora, mp4a\"'")); 1017 CanPlay("'application/vnd.apple.mpegurl; codecs=\"theora, mp4a\"'"));
988 EXPECT_EQ(kHLSMaybe, 1018 EXPECT_EQ(HLSMaybe,
989 CanPlay("'application/vnd.apple.mpegurl; codecs=\"theora, mp4a.40.2\"'")); 1019 CanPlay("'application/vnd.apple.mpegurl; codecs=\"theora, mp4a.40.2\"'"));
990 1020
991 EXPECT_EQ(kHLSMaybe, 1021 EXPECT_EQ(HLSMaybe,
992 CanPlay("'application/vnd.apple.mpegurl; codecs=\"AVC1\"'")); 1022 CanPlay("'application/vnd.apple.mpegurl; codecs=\"AVC1\"'"));
993 EXPECT_EQ(kHLSMaybe, 1023 EXPECT_EQ(HLSMaybe,
994 CanPlay("'application/vnd.apple.mpegurl; codecs=\"AVC1.4d401e\"'")); 1024 CanPlay("'application/vnd.apple.mpegurl; codecs=\"AVC1.4d401e\"'"));
995 EXPECT_EQ(kHLSMaybe, 1025 EXPECT_EQ(HLSMaybe,
996 CanPlay("'application/vnd.apple.mpegurl; codecs=\"AVC3\"'")); 1026 CanPlay("'application/vnd.apple.mpegurl; codecs=\"AVC3\"'"));
997 EXPECT_EQ(kHLSMaybe, 1027 EXPECT_EQ(HLSMaybe,
998 CanPlay("'application/vnd.apple.mpegurl; codecs=\"AVC3.64001f\"'")); 1028 CanPlay("'application/vnd.apple.mpegurl; codecs=\"AVC3.64001f\"'"));
999 EXPECT_EQ(kHLSMaybe, 1029 EXPECT_EQ(HLSMaybe,
1000 CanPlay("'application/vnd.apple.mpegurl; codecs=\"MP4A\"'")); 1030 CanPlay("'application/vnd.apple.mpegurl; codecs=\"MP4A\"'"));
1001 EXPECT_EQ(kHLSMaybe, 1031 EXPECT_EQ(HLSMaybe,
1002 CanPlay("'application/vnd.apple.mpegurl; codecs=\"MP4A.40.2\"'")); 1032 CanPlay("'application/vnd.apple.mpegurl; codecs=\"MP4A.40.2\"'"));
1003 EXPECT_EQ(kHLSMaybe, 1033 EXPECT_EQ(HLSMaybe,
1004 CanPlay("'application/vnd.apple.mpegurl; codecs=\"AVC1, MP4\"'")); 1034 CanPlay("'application/vnd.apple.mpegurl; codecs=\"AVC1, MP4\"'"));
1005 EXPECT_EQ(kHLSMaybe, 1035 EXPECT_EQ(HLSMaybe,
1006 CanPlay("'application/vnd.apple.mpegurl; codecs=\"AVC3, MP4\"'")); 1036 CanPlay("'application/vnd.apple.mpegurl; codecs=\"AVC3, MP4\"'"));
1007 EXPECT_EQ(kHLSMaybe, 1037 EXPECT_EQ(HLSMaybe,
1008 CanPlay("'application/vnd.apple.mpegurl; " 1038 CanPlay("'application/vnd.apple.mpegurl; "
1009 "codecs=\", AVC1.4D401E, MP4.40.2\"'")); 1039 "codecs=\", AVC1.4D401E, MP4.40.2\"'"));
1010 EXPECT_EQ(kHLSMaybe, 1040 EXPECT_EQ(HLSMaybe,
1011 CanPlay("'application/vnd.apple.mpegurl; " 1041 CanPlay("'application/vnd.apple.mpegurl; "
1012 "codecs=\", AVC3.64001F, MP4.40.2\"'")); 1042 "codecs=\", AVC3.64001F, MP4.40.2\"'"));
1013 1043
1014 EXPECT_EQ(kHLSMaybe, 1044 EXPECT_EQ(HLSMaybe,
1015 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc2\"'")); 1045 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc2\"'"));
1016 EXPECT_EQ(kHLSMaybe, 1046 EXPECT_EQ(HLSMaybe,
1017 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc4\"'")); 1047 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc4\"'"));
1018 1048
1019 EXPECT_EQ(kHLSMaybe, 1049 EXPECT_EQ(HLSMaybe,
1020 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1x\"'")); 1050 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1x\"'"));
1021 EXPECT_EQ(kHLSMaybe, 1051 EXPECT_EQ(HLSMaybe,
1022 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3x\"'")); 1052 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3x\"'"));
1023 EXPECT_EQ(kHLSMaybe, 1053 EXPECT_EQ(HLSMaybe,
1024 CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4ax\"'")); 1054 CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4ax\"'"));
1025 1055
1026 EXPECT_EQ(kHLSMaybe, 1056 EXPECT_EQ(HLSMaybe,
1027 CanPlay("'application/vnd.apple.mpegurl; codecs=\"unknown\"'")); 1057 CanPlay("'application/vnd.apple.mpegurl; codecs=\"unknown\"'"));
1028 // --------------------------------------------------------------------------- 1058 // ---------------------------------------------------------------------------
1029 } 1059 }
1030 1060
1031 #endif // !OS_ANDROID
1032
1033 } // namespace content 1061 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | net/base/mime_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698