Index: chrome/browser/media/media_browsertest.cc |
diff --git a/chrome/browser/media/media_browsertest.cc b/chrome/browser/media/media_browsertest.cc |
index aca81db7a572e5ba97155ed827c489a89a42abe0..7d68720164b4e2caf0a073c8398fbde7060cffd3 100644 |
--- a/chrome/browser/media/media_browsertest.cc |
+++ b/chrome/browser/media/media_browsertest.cc |
@@ -12,6 +12,8 @@ |
#include "content/public/browser/navigation_entry.h" |
#include "content/public/browser/web_contents.h" |
#include "content/public/test/browser_test_utils.h" |
+#include "media/base/test_data_util.h" |
+#include "net/test/spawned_test_server/spawned_test_server.h" |
// Common test results. |
const char MediaBrowserTest::kEnded[] = "ENDED"; |
@@ -33,7 +35,11 @@ void MediaBrowserTest::RunMediaTestPage(const std::string& html_page, |
std::string query = media::GetURLQueryString(query_params); |
scoped_ptr<net::SpawnedTestServer> http_test_server; |
if (http) { |
- http_test_server = media::StartMediaHttpTestServer(); |
+ http_test_server.reset( |
+ new net::SpawnedTestServer(net::SpawnedTestServer::TYPE_HTTP, |
+ net::SpawnedTestServer::kLocalhost, |
+ media::GetTestDataPath())); |
+ CHECK(http_test_server->Start()); |
gurl = http_test_server->GetURL("files/" + html_page + "?" + query); |
} else { |
gurl = content::GetFileUrlWithQuery(media::GetTestDataFilePath(html_page), |