Migrating tests to use EmbeddedTestServer (misc)

google_apis/drive/base_requests_unittest.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 "google_apis/drive/base_requests.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 97 matching lines @@
 
   void SetUp() override {
     request_context_getter_ = new net::TestURLRequestContextGetter(
         message_loop_.task_runner());
 
     sender_.reset(new RequestSender(new DummyAuthService,
                                     request_context_getter_.get(),
                                     message_loop_.task_runner(),
                                     std::string() /* custom user agent */));
 
-    ASSERT_TRUE(test_server_.InitializeAndWaitUntilReady());
+    ASSERT_TRUE(test_server_.Start());
     test_server_.RegisterRequestHandler(
         base::Bind(&BaseRequestsTest::HandleRequest, base::Unretained(this)));
   }
 
   scoped_ptr<net::test_server::HttpResponse> HandleRequest(
       const net::test_server::HttpRequest& request) {
     scoped_ptr<net::test_server::BasicHttpResponse> response(
         new net::test_server::BasicHttpResponse);
     response->set_code(response_code_);
     response->set_content(response_body_);
     response->set_content_type("application/json");
     return response.Pass();
   }
 
   base::MessageLoopForIO message_loop_;
   scoped_refptr<net::TestURLRequestContextGetter> request_context_getter_;
   scoped_ptr<RequestSender> sender_;
-  net::test_server::EmbeddedTestServer test_server_;
+  net::EmbeddedTestServer test_server_;
 
   net::HttpStatusCode response_code_;
   std::string response_body_;
 };
 
 typedef BaseRequestsTest MultipartUploadRequestBaseTest;
 
 TEST_F(BaseRequestsTest, ParseValidJson) {
   scoped_ptr<base::Value> json(ParseJson(kValidJsonString));
 
@@ skipping 74 matching lines @@
       "\n"
       "This is a sample file. I like chocolate and chips.\n"
       "\n"
       "--TESTBOUNDARY--",
       upload_content_data);
   ASSERT_EQ(HTTP_SUCCESS, error);
   EXPECT_EQ("file_id", file->file_id());
 }
 
 }  // Namespace google_apis