Revert 282795 "Have media content and chrome browser tests load ..."

trunk/src/content/browser/media/media_source_browsertest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "content/browser/media/media_browsertest.h"
 #include "content/public/common/content_switches.h"
 #if defined(OS_ANDROID)
 #include "base/android/build_info.h"
 #endif
@@ skipping 14 matching lines @@
   if (base::android::BuildInfo::GetInstance()->sdk_int() < 16) {
     VLOG(0) << "MSE is only supported in Android 4.1 and later.";
     return false;
   }
 #endif  // defined(OS_ANDROID)
   return true;
 }
 
 class MediaSourceTest : public content::MediaBrowserTest {
  public:
-  void TestSimplePlayback(const std::string& media_file,
-                          const std::string& media_type,
-                          const std::string& expectation) {
+  void TestSimplePlayback(const char* media_file, const char* media_type,
+                          const char* expectation) {
     if (!IsMSESupported()) {
       VLOG(0) << "Skipping test - MSE not supported.";
       return;
     }
 
-    media::QueryParams query_params;
-    query_params.push_back(std::make_pair("mediaFile", media_file));
-    query_params.push_back(std::make_pair("mediaType", media_type));
-    RunMediaTestPage("media_source_player.html", query_params, expectation,
+    std::vector<StringPair> query_params;
+    query_params.push_back(std::make_pair("mediafile", media_file));
+    query_params.push_back(std::make_pair("mediatype", media_type));
+    RunMediaTestPage("media_source_player.html", &query_params, expectation,
                      true);
   }
 
 #if defined(OS_ANDROID)
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitch(
         switches::kDisableGestureRequirementForMediaPlayback);
   }
 #endif
 };
@@ skipping 21 matching lines @@
   TestSimplePlayback("bear-320x240-video-only.webm", kWebMAudioOnly, kError);
 }
 
 // Flaky test crbug.com/246308
 // Test changed to skip checks resulting in flakiness. Proper fix still needed.
 IN_PROC_BROWSER_TEST_F(MediaSourceTest, ConfigChangeVideo) {
   if (!IsMSESupported()) {
     VLOG(0) << "Skipping test - MSE not supported.";
     return;
   }
-  RunMediaTestPage("mse_config_change.html",
-                   media::QueryParams(),
-                   kEnded,
-                   true);
+  RunMediaTestPage("mse_config_change.html", NULL, kEnded, true);
 }
 
 }  // namespace content