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

It broke browser tests. Probably need to update isolate files to fix it...

> Have media content and chrome browser tests load data from media/test/data
> 
> With media files copied over to media/test/data, this CL makes media related content browser tests and chrome browser tests load test data from one location. 
> 
> The location is common with media unit tests data forder;  managed in one place in media/base/test_data_util.h 
> 
> BUG=379314
> 
> Review URL: https://codereview.chromium.org/357413002

TBR=shadi@chromium.org

Review URL: https://codereview.chromium.org/383063009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282812 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 15 deletions

diff --git a/media/base/test_data_util.h b/media/base/test_data_util.h
index 955d615..8d51e96 100644
--- a/media/base/test_data_util.h
+++ b/media/base/test_data_util.h
@@ -6,34 +6,19 @@
 #define MEDIA_BASE_TEST_DATA_UTIL_H_
 
 #include <string>
-#include <utility>
-#include <vector>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "net/test/spawned_test_server/spawned_test_server.h"
 
 namespace media {
 
 class DecoderBuffer;
 
-typedef std::vector<std::pair<std::string, std::string> > QueryParams;
-
 // Returns a file path for a file in the media/test/data directory.
 base::FilePath GetTestDataFilePath(const std::string& name);
 
-// Returns relative path for test data folder: media/test/data.
-base::FilePath GetTestDataPath();
-
-// Starts an HTTP server serving files from media data path.
-scoped_ptr<net::SpawnedTestServer> StartMediaHttpTestServer();
-
-// Returns a string containing key value query params in the form of:
-// "key_1=value_1&key_2=value2"
-std::string GetURLQueryString(const QueryParams& query_params);
-
 // Reads a test file from media/test/data directory and stores it in
 // a DecoderBuffer.  Use DecoderBuffer vs DataBuffer to ensure no matter
 // what a test does, it's safe to use FFmpeg methods.