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

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

Issue 357413002: Have media content and chrome browser tests load data from media/test/data (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: few merge fixes Created 6 years, 5 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 (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 22 matching lines...) Expand all
33 class MediaSourceTest : public content::MediaBrowserTest { 33 class MediaSourceTest : public content::MediaBrowserTest {
34 public: 34 public:
35 void TestSimplePlayback(const char* media_file, const char* media_type, 35 void TestSimplePlayback(const char* media_file, const char* media_type,
36 const char* expectation) { 36 const char* expectation) {
37 if (!IsMSESupported()) { 37 if (!IsMSESupported()) {
38 VLOG(0) << "Skipping test - MSE not supported."; 38 VLOG(0) << "Skipping test - MSE not supported.";
39 return; 39 return;
40 } 40 }
41 41
42 std::vector<StringPair> query_params; 42 std::vector<StringPair> query_params;
43 query_params.push_back(std::make_pair("mediafile", media_file)); 43 query_params.push_back(std::make_pair("mediaFile", media_file));
jrummell 2014/07/02 00:33:40 Should these tags (mediaFile, mediaType, keySystem
shadi 2014/07/02 19:23:36 It seems like an over kill. These params are tied
44 query_params.push_back(std::make_pair("mediatype", media_type)); 44 query_params.push_back(std::make_pair("mediaType", media_type));
jrummell 2014/07/02 00:33:40 The other place where parameters are created has u
shadi 2014/07/02 19:23:36 True, but this test only uses media_source_player.
45 RunMediaTestPage("media_source_player.html", &query_params, expectation, 45 RunMediaTestPage("media_source_player.html", &query_params, expectation,
46 true); 46 true);
47 } 47 }
48 48
49 #if defined(OS_ANDROID) 49 #if defined(OS_ANDROID)
50 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 50 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
51 command_line->AppendSwitch( 51 command_line->AppendSwitch(
52 switches::kDisableGestureRequirementForMediaPlayback); 52 switches::kDisableGestureRequirementForMediaPlayback);
53 } 53 }
54 #endif 54 #endif
(...skipping 26 matching lines...) Expand all
81 // Test changed to skip checks resulting in flakiness. Proper fix still needed. 81 // Test changed to skip checks resulting in flakiness. Proper fix still needed.
82 IN_PROC_BROWSER_TEST_F(MediaSourceTest, ConfigChangeVideo) { 82 IN_PROC_BROWSER_TEST_F(MediaSourceTest, ConfigChangeVideo) {
83 if (!IsMSESupported()) { 83 if (!IsMSESupported()) {
84 VLOG(0) << "Skipping test - MSE not supported."; 84 VLOG(0) << "Skipping test - MSE not supported.";
85 return; 85 return;
86 } 86 }
87 RunMediaTestPage("mse_config_change.html", NULL, kEnded, true); 87 RunMediaTestPage("mse_config_change.html", NULL, kEnded, true);
88 } 88 }
89 89
90 } // namespace content 90 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698