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

media/base/test_data_util.cc

Index: media/base/test_data_util.cc
diff --git a/media/base/test_data_util.cc b/media/base/test_data_util.cc
index a83fa840b41c70ed4e36f11bfdc3d900fc2a079a..c821308499a1b73e0696672cb88ffc9ee40972d7 100644
--- a/media/base/test_data_util.cc
+++ b/media/base/test_data_util.cc
@@ -15,11 +15,34 @@ namespace media {
 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(FILE_PATH_LITERAL("media/test/data"));

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

nit: put "media/test/data" in a file level const char array?

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

Can't make it a const char, it has to be a CharType array. 

+}
+
+std::string GetURLQueryString(std::vector<StringPair>* query_params) {
+  std::string query = "";
+  if (query_params != NULL && !query_params->empty()) {
+    std::vector<StringPair>::const_iterator itr = query_params->begin();
+    query = itr->first + "=" + itr->second;
+    ++itr;
+    for (; itr != query_params->end(); ++itr) {
+      query.append("&" + itr->first + "=" + itr->second);
+    }
+  }
+  return query;
+}

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

How about letting this function return the query starts with "?" ? This way, you
can always do:

query.append("&" + itr->first + "=" + itr->second);

for each query. Then at the end of the function, if "query" isn't empty, just
change query[0] from '&' to '?'.

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

Having query start with "?" would not work with
content::GetFileUrlWithQuery(file_path, query), it will cause 2 '?' characters
in the URL. In general, the query should only be what comes after the '?'.  How
about the new code in this patch?

 
-  return file_path.AppendASCII("media")
-      .AppendASCII("test")
-      .AppendASCII("data")
-      .AppendASCII(name);
+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) {