Migrating tests to use EmbeddedTestServer (misc)

chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc

Index: chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc
diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc
index 14e92096103590b7fa99bb0100735b633f2b7c8b..fa77c74580a4892e6afe68652a9c587ca3bb3de6 100644
--- a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc
+++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc
@@ -197,11 +197,11 @@ class PhishingClassifierDelegateTest : public InProcessBrowserTest {
 
   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(&PhishingClassifierDelegateTest::HandleRequest,
                    base::Unretained(this)));
-    return embedded_test_server_->InitializeAndWaitUntilReady();
+    return embedded_test_server_->Start();

[mmenke, 2015/11/05 18:21:03]

Per comment in other file, can also switch this to embedded_test_server()

[svaldez, 2015/11/05 18:34:51]

Done.

   }
 
   scoped_ptr<net::test_server::HttpResponse> HandleRequest(
@@ -256,7 +256,7 @@ class PhishingClassifierDelegateTest : public InProcessBrowserTest {
   scoped_refptr<InterceptingMessageFilter> intercepting_filter_;
   GURL response_url_;
   std::string response_content_;
-  scoped_ptr<net::test_server::EmbeddedTestServer> embedded_test_server_;
+  scoped_ptr<net::EmbeddedTestServer> embedded_test_server_;
   scoped_ptr<ClientPhishingRequest> verdict_;
   StrictMock<MockPhishingClassifier>* classifier_;  // Owned by |delegate_|.
   int32_t render_view_routing_id_;