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

trunk/src/content/browser/media/media_browsertest.h

 // Copyright 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.
 
 #ifndef CONTENT_BROWSER_MEDIA_MEDIA_BROWSERTEST_H_
 #define CONTENT_BROWSER_MEDIA_MEDIA_BROWSERTEST_H_
 
-#include <string>
+#include <utility>
+#include <vector>
 
 #include "content/public/test/content_browser_test.h"
-#include "media/base/test_data_util.h"
 
 namespace content {
 
 class TitleWatcher;
 
 // Class used to automate running media related browser tests. The functions
 // assume that media files are located under files/media/ folder known to
 // the test http server.
 class MediaBrowserTest : public ContentBrowserTest {
  public:
+  typedef std::pair<const char*, const char*> StringPair;
+
   // Common test results.
   static const char kEnded[];
   static const char kError[];
   static const char kFailed[];
 
   // Runs a html page with a list of URL query parameters.
   // If http is true, the test starts a local http test server to load the test
   // page, otherwise a local file URL is loaded inside the content shell.
   // It uses RunTest() to check for expected test output.
-  void RunMediaTestPage(const std::string& html_page,
-                        const media::QueryParams& query_params,
-                        const std::string& expected,
-                        bool http);
+  void RunMediaTestPage(const char* html_page,
+                        std::vector<StringPair>* query_params,
+                        const char* expected, bool http);
 
   // Opens a URL and waits for the document title to match either one of the
-  // default strings or the expected string. Returns the matching title value.
-  std::string RunTest(const GURL& gurl, const std::string& expected);
+  // default strings or the expected string.
+  void RunTest(const GURL& gurl, const char* expected);
 
   virtual void AddWaitForTitles(content::TitleWatcher* title_watcher);
 };
 
-}  // namespace content
+} // namespace content
 
 #endif  // CONTENT_BROWSER_MEDIA_MEDIA_BROWSERTEST_H_