Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2856)

Unified Diff: chrome/browser/media/media_browsertest.cc

Issue 438963005: Purge net/ and ui/base from media_unittest DEPS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove gl from perftests. Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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),
« no previous file with comments | « chrome/browser/media/encrypted_media_istypesupported_browsertest.cc ('k') | content/browser/media/media_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698