Migrating tests to use EmbeddedTestServer (misc)

chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc

 // Copyright (c) 2012 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.
 //
 // Note that although this is not a "browser" test, it runs as part of
 // browser_tests.  This is because WebKit does not work properly if it is
 // shutdown and re-initialized.  Since browser_tests runs each test in a
 // new process, this avoids the problem.
 
 #include "chrome/renderer/safe_browsing/phishing_dom_feature_extractor.h"
@@ skipping 116 matching lines @@
   void RemoveIframe() {
     blink::WebFrame* main_frame = GetWebFrame();
     ASSERT_TRUE(main_frame);
     main_frame->executeScript(
         blink::WebString(
             "document.body.removeChild(document.getElementById('frame1'));"));
   }
 
   bool StartTestServer() {
     CHECK(!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(&PhishingDOMFeatureExtractorTest::HandleRequest,
                    base::Unretained(this)));
-    return embedded_test_server_->InitializeAndWaitUntilReady();
+    return embedded_test_server_->Start();
   }
 
   scoped_ptr<net::test_server::HttpResponse> HandleRequest(
       const net::test_server::HttpRequest& request) {
     std::map<std::string, std::string>::const_iterator host_it =
         request.headers.find("Host");
     if (host_it == request.headers.end())
       return scoped_ptr<net::test_server::HttpResponse>();
 
     std::string url =
@@ skipping 25 matching lines @@
     ui_test_utils::NavigateToURL(browser(), url);
     return url;
   }
 
   int32 render_view_routing_id_;
 
   // Map of url -> response body for network requests from the renderer.
   // Any urls not in this map are served a 404 error.
   std::map<std::string, std::string> responses_;
 
-  scoped_ptr<net::test_server::EmbeddedTestServer> embedded_test_server_;
+  scoped_ptr<net::EmbeddedTestServer> embedded_test_server_;
   MockFeatureExtractorClock clock_;
   scoped_ptr<PhishingDOMFeatureExtractor> extractor_;
   bool success_;  // holds the success value from ExtractFeatures
   base::WeakPtrFactory<PhishingDOMFeatureExtractorTest> weak_factory_;
 };
 
 IN_PROC_BROWSER_TEST_F(PhishingDOMFeatureExtractorTest, FormFeatures) {
   // This test doesn't exercise the extraction timing.
   EXPECT_CALL(clock_, Now()).WillRepeatedly(Return(base::TimeTicks::Now()));
 
@@ skipping 76 matching lines @@
       "</body></html");
   ASSERT_TRUE(ExtractFeatures(&features));
   ExpectFeatureMapsAreEqual(features, expected_features);
 
   expected_features.Clear();
   expected_features.AddRealFeature(features::kPageExternalLinksFreq, 0.25);
   expected_features.AddRealFeature(features::kPageSecureLinksFreq, 0.5);
   expected_features.AddBooleanFeature(features::kPageLinkDomain +
                                       std::string("chromium.org"));
 
-  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());
 
   // The PhishingDOMFeatureExtractor depends on URLs being domains and not IPs,
   // so use a domain.
   std::string url_str = "https://host.com:";
   url_str += base::UintToString(https_server.host_port_pair().port());
-  url_str += "/files/safe_browsing/secure_link_features.html";
+  url_str += "/safe_browsing/secure_link_features.html";

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

Not a big fan of manually manupulating URLs if we don't have to.  Here and
below, can we just get the URL from the https_server, and then use
GURL::Replacements to change the host?

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

Done.

   ui_test_utils::NavigateToURL(browser(), GURL(url_str));
 
   // Click through the certificate error interstitial.
   content::InterstitialPage* interstitial_page =
       GetWebContents()->GetInterstitialPage();
   interstitial_page->Proceed();
   content::WaitForLoadStop(GetWebContents());
 
   features.Clear();
   ASSERT_TRUE(ExtractFeatures(&features));
@@ skipping 20 matching lines @@
       "<html><head><script></script><script></script></head></html>");
   ASSERT_TRUE(ExtractFeatures(&features));
   ExpectFeatureMapsAreEqual(features, expected_features);
 
   expected_features.Clear();
   expected_features.AddBooleanFeature(features::kPageNumScriptTagsGTOne);
   expected_features.AddBooleanFeature(features::kPageNumScriptTagsGTSix);
   expected_features.AddRealFeature(features::kPageImgOtherDomainFreq, 0.5);
 
   features.Clear();
-  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());
 
   // The PhishingDOMFeatureExtractor depends on URLs being domains and not IPs,
   // so use a domain.
   std::string url_str = "https://host.com:";
   url_str += base::UintToString(https_server.host_port_pair().port());
-  url_str += "/files/safe_browsing/secure_script_and_image.html";
+  url_str += "/safe_browsing/secure_script_and_image.html";
   ui_test_utils::NavigateToURL(browser(), GURL(url_str));
 
   // Click through the certificate error interstitial.
   content::InterstitialPage* interstitial_page =
       GetWebContents()->GetInterstitialPage();
   interstitial_page->Proceed();
   content::WaitForLoadStop(GetWebContents());
 
   ASSERT_TRUE(ExtractFeatures(&features));
   ExpectFeatureMapsAreEqual(features, expected_features);
@@ skipping 191 matching lines @@
   LoadHtml(
       "host.com",
       "<html><head></head><body>"
       "<iframe src=\"frame.html\" id=\"frame1\"></iframe>"
       "<form></form></body></html>");
   ASSERT_TRUE(ExtractFeatures(&features));
   ExpectFeatureMapsAreEqual(features, expected_features);
 }
 
 }  // namespace safe_browsing