Migrating tests to use EmbeddedTestServer (misc)

chrome/renderer/safe_browsing/phishing_classifier_delegate_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.
 
 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h"
 
 #include <stdint.h>
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 179 matching lines @@
 
   void PageCaptured(base::string16* page_text, bool preliminary_capture) {
     PostTaskToInProcessRendererAndWait(
         base::Bind(&PhishingClassifierDelegate::PageCaptured,
                    base::Unretained(delegate_), page_text,
                    preliminary_capture));
   }
 
   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(
       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 34 matching lines @@
   }
 
   void GoForward() {
     GetWebContents()->GetController().GoForward();
     content::WaitForLoadStop(GetWebContents());
   }
 
   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_;
   PhishingClassifierDelegate* delegate_;  // Owned by the RenderView.
   scoped_refptr<content::MessageLoopRunner> runner_;
 };
 
 IN_PROC_BROWSER_TEST_F(PhishingClassifierDelegateTest, Navigation) {
   MockScorer scorer;
   delegate_->SetPhishingScorer(&scorer);
@@ skipping 373 matching lines @@
   RunClassificationDone(verdict);
   ASSERT_TRUE(intercepting_filter_->verdict());
   EXPECT_EQ(verdict.SerializeAsString(),
             intercepting_filter_->verdict()->SerializeAsString());
 
   // The delegate will cancel pending classification on destruction.
   EXPECT_CALL(*classifier_, CancelPendingClassification());
 }
 
 }  // namespace safe_browsing