Migrating tests to use EmbeddedTestServer (/chrome/browser misc)

chrome/browser/speech/speech_recognition_browsertest.cc

Index: chrome/browser/speech/speech_recognition_browsertest.cc
diff --git a/chrome/browser/speech/speech_recognition_browsertest.cc b/chrome/browser/speech/speech_recognition_browsertest.cc
index ceb0ff1a05fad419fb4ff2aa8d0ffc0a29f65d94..ca242a4c2ae0f088af43e20abcf83c154e74b2c0 100644
--- a/chrome/browser/speech/speech_recognition_browsertest.cc
+++ b/chrome/browser/speech/speech_recognition_browsertest.cc
@@ -80,16 +80,14 @@ class SpeechWebContentsObserver : public content::WebContentsObserver {
 // when a WebContents goes away (WCO::WebContentsDestroyed) or the RVH
 // changes within a WebContents (WCO::RenderViewHostChanged).
 IN_PROC_BROWSER_TEST_F(ChromeSpeechRecognitionTest, BasicTearDown) {
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
-  net::SpawnedTestServer::SSLOptions ssl_options;
-  net::SpawnedTestServer https_server(
-      net::SpawnedTestServer::TYPE_HTTPS, ssl_options,
-      base::FilePath(FILE_PATH_LITERAL("chrome/test/data")));
+  ASSERT_TRUE(embedded_test_server()->Start());
+  net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS);
+  https_server.ServeFilesFromSourceDirectory("chrome/test/data");
   ASSERT_TRUE(https_server.Start());
 
   GURL http_url =
       embedded_test_server()->GetURL("/speech/web_speech_test.html");
-  GURL https_url(https_server.GetURL("files/speech/web_speech_test.html"));
+  GURL https_url(https_server.GetURL("/speech/web_speech_test.html"));
 
   scoped_ptr<ChromeSpeechRecognitionManagerDelegate> delegate(
       new ChromeSpeechRecognitionManagerDelegate());