Migrating tests to use EmbeddedTestServer (misc)

chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc

Index: chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc
diff --git a/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc b/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc
index 837321315e8e262a396a126e363b8d211191269b..90278fb52108bdf6d46d8c68288384d6f5405a49 100644
--- a/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc
+++ b/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc
@@ -154,15 +154,15 @@ class PhishingClassifierTest : public InProcessBrowserTest {
     run_loop->Quit();
   }
 
-  scoped_ptr<net::test_server::EmbeddedTestServer> embedded_test_server_;
-  net::test_server::EmbeddedTestServer* embedded_test_server() {
+  scoped_ptr<net::EmbeddedTestServer> embedded_test_server_;
+  net::EmbeddedTestServer* embedded_test_server() {
     // TODO(ajwong): Merge this into BrowserTestBase.

[mmenke, 2015/11/05 17:38:13]

Can we just address this in this CL?  Same goes for other safebrowsing files. 
Fine to keep as-is, if it looks like too much effort for this CL.

[svaldez, 2015/11/05 18:15:55]

Done.

     if (!embedded_test_server_) {
-      embedded_test_server_.reset(new net::test_server::EmbeddedTestServer());
+      embedded_test_server_.reset(new net::EmbeddedTestServer());
       embedded_test_server_->RegisterRequestHandler(
           base::Bind(&PhishingClassifierTest::HandleRequest,
                      base::Unretained(this)));
-      CHECK(embedded_test_server_->InitializeAndWaitUntilReady());
+      CHECK(embedded_test_server_->Start());
     }
     return embedded_test_server_.get();
   }
@@ -263,14 +263,12 @@ IN_PROC_BROWSER_TEST_F(PhishingClassifierTest, MAYBE_TestClassification) {
   EXPECT_EQ(PhishingClassifier::kInvalidScore, phishy_score);
 
   // Extraction should also fail for this case because the URL is not http.
-  net::SpawnedTestServer https_server(
-      net::SpawnedTestServer::TYPE_HTTPS,
-      net::SpawnedTestServer::kLocalhost,
-      base::FilePath(FILE_PATH_LITERAL("chrome/test/data")));
+  net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS);
+  https_server.ServeFilesFromSourceDirectory("chrome/test/data");
   ASSERT_TRUE(https_server.Start());
   GURL::Replacements replace_host;
   replace_host.SetHostStr("host.net");
-  GURL test_url = https_server.GetURL("/files/title1.html");
+  GURL test_url = https_server.GetURL("/title1.html");
   ui_test_utils::NavigateToURL(browser(),
                                test_url.ReplaceComponents(replace_host));
   EXPECT_FALSE(RunPhishingClassifier(&page_text, &phishy_score, &features));