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

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

Issue 884103004: Update {virtual,override,final} to follow C++11 style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
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
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 42
43 base::StringPairs query_params; 43 base::StringPairs query_params;
44 query_params.push_back(std::make_pair("mediaFile", media_file)); 44 query_params.push_back(std::make_pair("mediaFile", media_file));
45 query_params.push_back(std::make_pair("mediaType", media_type)); 45 query_params.push_back(std::make_pair("mediaType", media_type));
46 query_params.push_back(std::make_pair("usePrefixedEME", "1")); 46 query_params.push_back(std::make_pair("usePrefixedEME", "1"));
47 RunMediaTestPage("media_source_player.html", query_params, expectation, 47 RunMediaTestPage("media_source_player.html", query_params, expectation,
48 true); 48 true);
49 } 49 }
50 50
51 #if defined(OS_ANDROID) 51 #if defined(OS_ANDROID)
52 virtual void SetUpCommandLine(base::CommandLine* command_line) override { 52 void SetUpCommandLine(base::CommandLine* command_line) override {
53 command_line->AppendSwitch( 53 command_line->AppendSwitch(
54 switches::kDisableGestureRequirementForMediaPlayback); 54 switches::kDisableGestureRequirementForMediaPlayback);
55 } 55 }
56 #endif 56 #endif
57 }; 57 };
58 58
59 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_VideoAudio_WebM) { 59 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_VideoAudio_WebM) {
60 TestSimplePlayback("bear-320x240.webm", kWebMAudioVideo, kEnded); 60 TestSimplePlayback("bear-320x240.webm", kWebMAudioVideo, kEnded);
61 } 61 }
62 62
(...skipping 22 matching lines...) Expand all
85 if (!IsMSESupported()) { 85 if (!IsMSESupported()) {
86 VLOG(0) << "Skipping test - MSE not supported."; 86 VLOG(0) << "Skipping test - MSE not supported.";
87 return; 87 return;
88 } 88 }
89 base::StringPairs query_params; 89 base::StringPairs query_params;
90 query_params.push_back(std::make_pair("usePrefixedEME", "1")); 90 query_params.push_back(std::make_pair("usePrefixedEME", "1"));
91 RunMediaTestPage("mse_config_change.html", query_params, kEnded, true); 91 RunMediaTestPage("mse_config_change.html", query_params, kEnded, true);
92 } 92 }
93 93
94 } // namespace content 94 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698