Revert media_browsertest migration back to SpawnedTestServer.

chrome/browser/media/media_browsertest.h

 // 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.
 
 #ifndef CHROME_BROWSER_MEDIA_MEDIA_BROWSERTEST_H_
 #define CHROME_BROWSER_MEDIA_MEDIA_BROWSERTEST_H_
 
 #include <string>
 
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "media/base/test_data_util.h"
 
 namespace content {
 class TitleWatcher;
 }
 
 // Class used to automate running media related browser tests. The functions
-// assume that media files are located under media/ folder known to the test
-// http server.
+// assume that media files are located under files/media/ folder known to
+// the test http server.
 class MediaBrowserTest : public InProcessBrowserTest,
                          public content::WebContentsObserver {
  protected:
   // Common test results.
   static const char kEnded[];
   // TODO(xhwang): Report detailed errors, e.g. "ERROR-3".
   static const char kError[];
   static const char kFailed[];
 
   MediaBrowserTest();
@@ skipping 20 matching lines @@
                      base::ProcessId plugin_pid) override;
 
   // When called, the test will ignore any plugin crashes and not fail the test.
   void IgnorePluginCrash();
 
  private:
   bool ignore_plugin_crash_;
 };
 
 #endif  // CHROME_BROWSER_MEDIA_MEDIA_BROWSERTEST_H_