| Index: chrome/browser/media/encrypted_media_istypesupported_browsertest.cc
|
| diff --git a/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc b/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc
|
| index 3e7dc6c1a9a696ec2fd51b0612ff62fe26306f0e..2a3ba36fdbc13b82a878b7ceaba469d250942036 100644
|
| --- a/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc
|
| +++ b/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc
|
| @@ -18,6 +18,7 @@
|
| #include "content/public/common/content_switches.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"
|
| #include "url/gurl.h"
|
|
|
| #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
|
| @@ -225,8 +226,11 @@ class EncryptedMediaIsTypeSupportedTest : public InProcessBrowserTest {
|
| // Load the test page needed. IsConcreteSupportedKeySystem() needs some
|
| // JavaScript and a video loaded in order to work.
|
| if (!is_test_page_loaded_) {
|
| - scoped_ptr<net::SpawnedTestServer> http_test_server =
|
| - media::StartMediaHttpTestServer();
|
| + scoped_ptr<net::SpawnedTestServer> http_test_server(
|
| + new net::SpawnedTestServer(net::SpawnedTestServer::TYPE_HTTP,
|
| + net::SpawnedTestServer::kLocalhost,
|
| + media::GetTestDataPath()));
|
| + CHECK(http_test_server->Start());
|
| GURL gurl = http_test_server->GetURL(
|
| "files/test_key_system_instantiation.html");
|
| ui_test_utils::NavigateToURL(browser(), gurl);
|
|
|