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

trunk/src/media/base/test_data_util.cc

Index: trunk/src/media/base/test_data_util.cc
===================================================================
--- trunk/src/media/base/test_data_util.cc	(revision 282811)
+++ trunk/src/media/base/test_data_util.cc	(working copy)
@@ -12,40 +12,16 @@
 
 namespace media {
 
-const base::FilePath::CharType kTestDataPath[] =
-    FILE_PATH_LITERAL("media/test/data");
-
 base::FilePath GetTestDataFilePath(const std::string& name) {
   base::FilePath file_path;
   CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &file_path));
-  return file_path.Append(GetTestDataPath()).AppendASCII(name);
-}
 
-base::FilePath GetTestDataPath() {
-  return base::FilePath(kTestDataPath);
+  return file_path.AppendASCII("media")
+      .AppendASCII("test")
+      .AppendASCII("data")
+      .AppendASCII(name);
 }
 
-std::string GetURLQueryString(const QueryParams& query_params) {
-  std::string query = "";
-  QueryParams::const_iterator itr = query_params.begin();
-  for (; itr != query_params.end(); ++itr) {
-    if (itr != query_params.begin())
-      query.append("&");
-    query.append(itr->first + "=" + itr->second);
-  }
-  return query;
-}
-
-scoped_ptr<net::SpawnedTestServer> StartMediaHttpTestServer() {
-  scoped_ptr<net::SpawnedTestServer> http_test_server;
-  http_test_server.reset(new net::SpawnedTestServer(
-      net::SpawnedTestServer::TYPE_HTTP,
-      net::SpawnedTestServer::kLocalhost,
-      GetTestDataPath()));
-  CHECK(http_test_server->Start());
-  return http_test_server.Pass();
-}
-
 scoped_refptr<DecoderBuffer> ReadTestDataFile(const std::string& name) {
   base::FilePath file_path = GetTestDataFilePath(name);