Migrating tests to use EmbeddedTestServer (misc)

google_apis/drive/files_list_request_runner_unittest.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 "google_apis/drive/files_list_request_runner.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/sequenced_task_runner.h"
@@ skipping 55 matching lines @@
     request_context_getter_ =
         new net::TestURLRequestContextGetter(message_loop_.task_runner());
 
     request_sender_.reset(
         new RequestSender(new DummyAuthService, request_context_getter_.get(),
                           message_loop_.task_runner(), kTestUserAgent));
 
     test_server_.RegisterRequestHandler(
         base::Bind(&FilesListRequestRunnerTest::OnFilesListRequest,
                    base::Unretained(this), test_server_.base_url()));
-    ASSERT_TRUE(test_server_.InitializeAndWaitUntilReady());
+    ASSERT_TRUE(test_server_.Start());
 
     runner_.reset(new FilesListRequestRunner(
         request_sender_.get(),
         google_apis::DriveApiUrlGenerator(test_server_.base_url(),
                                           test_server_.GetURL("/download/"))));
   }
 
   void TearDown() override {
     on_completed_callback_ = base::Closure();
     http_request_.reset();
@@ skipping 23 matching lines @@
   // Handles a HTTP request to the Drive API server and returns a fake response.
   scoped_ptr<net::test_server::HttpResponse> OnFilesListRequest(
       const GURL& base_url,
       const net::test_server::HttpRequest& request) {
     http_request_.reset(new net::test_server::HttpRequest(request));
     return fake_server_response_.Pass();
   }
 
   base::MessageLoopForIO message_loop_;  // Test server needs IO thread.
   scoped_ptr<RequestSender> request_sender_;
-  net::test_server::EmbeddedTestServer test_server_;
+  net::EmbeddedTestServer test_server_;
   scoped_ptr<FilesListRequestRunner> runner_;
   scoped_refptr<net::TestURLRequestContextGetter> request_context_getter_;
   base::Closure on_completed_callback_;
 
   // Response set by test cases to be returned from the HTTP server.
   scoped_ptr<net::test_server::BasicHttpResponse> fake_server_response_;
 
   // A requests and a response stored for verification in test cases.
   scoped_ptr<net::test_server::HttpRequest> http_request_;
   scoped_ptr<DriveApiErrorCode> response_error_;
@@ skipping 133 matching lines @@
       http_request_->relative_url);
 
   // There must be no backoff in case of an error different than
   // DRIVE_RESPONSE_TOO_LARGE.
   ASSERT_TRUE(response_error_.get());
   EXPECT_EQ(DRIVE_NO_SPACE, *response_error_);
   EXPECT_FALSE(response_entry_.get());
 }
 
 }  // namespace google_apis