Revert media_browsertest migration back to SpawnedTestServer.

chrome/browser/media/media_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/media/media_browsertest.h"
 
 #include "base/i18n/time_formatting.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/navigation_controller.h"
 #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/embedded_test_server/embedded_test_server.h"
+#include "net/test/spawned_test_server/spawned_test_server.h"
 
 // Common test results.
 const char MediaBrowserTest::kEnded[] = "ENDED";
 const char MediaBrowserTest::kError[] = "ERROR";
 const char MediaBrowserTest::kFailed[] = "FAILED";
 
-MediaBrowserTest::MediaBrowserTest() : ignore_plugin_crash_(false) {
-}
+MediaBrowserTest::MediaBrowserTest() : ignore_plugin_crash_(false) {}
 
-MediaBrowserTest::~MediaBrowserTest() {
-}
+MediaBrowserTest::~MediaBrowserTest() {}
 
 void MediaBrowserTest::RunMediaTestPage(const std::string& html_page,
                                         const base::StringPairs& query_params,
                                         const std::string& expected_title,
                                         bool http) {
   GURL gurl;
   std::string query = media::GetURLQueryString(query_params);
-  scoped_ptr<net::EmbeddedTestServer> http_test_server;
+  scoped_ptr<net::SpawnedTestServer> http_test_server;
   if (http) {
     DVLOG(0) << base::TimeFormatTimeOfDayWithMilliseconds(base::Time::Now())
              << " Starting HTTP server";
-    http_test_server.reset(new net::EmbeddedTestServer);
-    http_test_server->ServeFilesFromSourceDirectory(media::GetTestDataPath());
+    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("/" + html_page + "?" + query);
+    gurl = http_test_server->GetURL("files/" + html_page + "?" + query);
   } else {
     gurl = content::GetFileUrlWithQuery(media::GetTestDataFilePath(html_page),
                                         query);
   }
   std::string final_title = RunTest(gurl, expected_title);
   EXPECT_EQ(expected_title, final_title);
 }
 
 std::string MediaBrowserTest::RunTest(const GURL& gurl,
                                       const std::string& expected_title) {
@@ skipping 20 matching lines @@
                                      base::ProcessId plugin_pid) {
   DVLOG(0) << "Plugin crashed: " << plugin_path.value();
   if (ignore_plugin_crash_)
     return;
   ADD_FAILURE() << "Failing test due to plugin crash.";
 }
 
 void MediaBrowserTest::IgnorePluginCrash() {
   ignore_plugin_crash_ = true;
 }