Have media content and chrome browser tests load data from media/test/data

media/base/test_data_util.h

Index: media/base/test_data_util.h
diff --git a/media/base/test_data_util.h b/media/base/test_data_util.h
index 8d51e96c736160f3ba0e7c9d91097d2427483791..5c979e17a5f97390a282ae4f817ea31b509a930b 100644
--- a/media/base/test_data_util.h
+++ b/media/base/test_data_util.h
@@ -11,14 +11,27 @@
 #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::pair<std::string, std::string> StringPair;

[xhwang, 2014/07/07 17:39:55]

It seems we alway use StringPair in std::vector<media::StringPair>. Why not
define std::vector<media::StringPair> to a new type, e.g. QueryParams? 

Actually, why not just use a base::hash_map<std::string, std::string> for
QueryParams?

[shadi, 2014/07/07 22:58:44]

Since we only use the vector to iterate once over all values, it seems more
reasonable to use vector than map. Plus, we should allow duplicate keys in a
query as well.

+
 // 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();

[xhwang, 2014/07/07 17:39:55]

Newbie question: what happens when the returned scpoed_ptr goes out of scope?
Will the server be terminated?

[shadi, 2014/07/07 22:58:44]

Yes, the destructor calls Stop() on the server. Having said that, most tests
block until a matching title is obtained (and thus before the server is
stopped).

+
+// Returns a string containing key value query params in the form of:
+// "key_1=value_1&key_2=value2"
+std::string GetURLQueryString(std::vector<StringPair>* query_params);

[xhwang, 2014/07/07 17:39:55]

It seems |query_params| is an input param and should not change in this
function. Why not pass |query_params| by const ref, i.e. 
GetURLQueryString(const std::vector<StringPair>& query_params)

[shadi, 2014/07/07 22:58:44]

Done.

+
 // 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.