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

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

Issue 258823004: Fix unused variable warning. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | 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 "content/browser/media/media_browsertest.h" 6 #include "content/browser/media/media_browsertest.h"
7 #include "content/public/common/content_switches.h" 7 #include "content/public/common/content_switches.h"
8 #if defined(OS_ANDROID) 8 #if defined(OS_ANDROID)
9 #include "base/android/build_info.h" 9 #include "base/android/build_info.h"
10 #endif 10 #endif
11 11
12 // Common media types. 12 // Common media types.
13 const char kWebMAudioOnly[] = "audio/webm; codecs=\"vorbis\""; 13 const char kWebMAudioOnly[] = "audio/webm; codecs=\"vorbis\"";
14 #if !defined(OS_ANDROID) 14 #if !defined(OS_ANDROID)
15 const char kWebMOpusAudioOnly[] = "audio/webm; codecs=\"opus\""; 15 // TODO(dalecurtis): Disabled while the test data file is updated.
16 // const char kWebMOpusAudioOnly[] = "audio/webm; codecs=\"opus\"";
16 #endif 17 #endif
17 const char kWebMVideoOnly[] = "video/webm; codecs=\"vp8\""; 18 const char kWebMVideoOnly[] = "video/webm; codecs=\"vp8\"";
18 const char kWebMAudioVideo[] = "video/webm; codecs=\"vorbis, vp8\""; 19 const char kWebMAudioVideo[] = "video/webm; codecs=\"vorbis, vp8\"";
19 20
20 namespace content { 21 namespace content {
21 22
22 // MSE is available on all desktop platforms and on Android 4.1 and later. 23 // MSE is available on all desktop platforms and on Android 4.1 and later.
23 static bool IsMSESupported() { 24 static bool IsMSESupported() {
24 #if defined(OS_ANDROID) 25 #if defined(OS_ANDROID)
25 if (base::android::BuildInfo::GetInstance()->sdk_int() < 16) { 26 if (base::android::BuildInfo::GetInstance()->sdk_int() < 16) {
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 // Test changed to skip checks resulting in flakiness. Proper fix still needed. 83 // Test changed to skip checks resulting in flakiness. Proper fix still needed.
83 IN_PROC_BROWSER_TEST_F(MediaSourceTest, ConfigChangeVideo) { 84 IN_PROC_BROWSER_TEST_F(MediaSourceTest, ConfigChangeVideo) {
84 if (!IsMSESupported()) { 85 if (!IsMSESupported()) {
85 VLOG(0) << "Skipping test - MSE not supported."; 86 VLOG(0) << "Skipping test - MSE not supported.";
86 return; 87 return;
87 } 88 }
88 RunMediaTestPage("mse_config_change.html", NULL, kEnded, true); 89 RunMediaTestPage("mse_config_change.html", NULL, kEnded, true);
89 } 90 }
90 91
91 } // namespace content 92 } // 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