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

chrome/browser/speech/speech_recognition_browsertest.cc

 // Copyright 2015 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 "base/strings/utf_string_conversions.h"
 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ skipping 62 matching lines @@
   bool render_view_host_changed_;
   bool web_contents_destroyed_;
 
   DISALLOW_COPY_AND_ASSIGN(SpeechWebContentsObserver);
 };
 
 // Tests that ChromeSpeechRecognitionManagerDelegate works properly
 // 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());
   static_cast<content::FakeSpeechRecognitionManager*>(
       fake_speech_recognition_manager_.get())->SetDelegate(delegate.get());
 
   ui_test_utils::NavigateToURL(browser(), http_url);
   WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_TRUE(web_contents);
@@ skipping 37 matching lines @@
         web_contents, kRetriveTranscriptScript, &output));
     EXPECT_EQ(kExpectedTranscript, output);
   }
 
   // Close the tab to so that we see WCO::WebContentsDestroyed().
   chrome::CloseTab(browser());
   EXPECT_TRUE(speech_contents_observer.web_contents_destroyed());
 }
 
 }  // namespace speech