Revert 282795 "Have media content and chrome browser tests load ..."

trunk/src/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc

Index: trunk/src/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc
===================================================================
--- trunk/src/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc	(revision 282811)
+++ trunk/src/chrome/browser/media/encrypted_media_istypesupported_browsertest.cc	(working copy)
@@ -17,7 +17,6 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
-#include "media/base/test_data_util.h"
 #include "url/gurl.h"
 
 #include "widevine_cdm_version.h"  // In SHARED_INTERMEDIATE_DIR.
@@ -225,10 +224,9 @@
     // 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();
-      GURL gurl = http_test_server->GetURL(
-          "files/test_key_system_instantiation.html");
+      ASSERT_TRUE(test_server()->Start());
+      GURL gurl = test_server()->GetURL(
+          "files/media/test_key_system_instantiation.html");
       ui_test_utils::NavigateToURL(browser(), gurl);
       is_test_page_loaded_ = true;
     }