Migrating tests to use EmbeddedTestServer (misc)

google_apis/drive/base_requests_server_unittest.cc

 // Copyright (c) 2013 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/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 27 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));
 
-    ASSERT_TRUE(test_server_.InitializeAndWaitUntilReady());
+    ASSERT_TRUE(test_server_.Start());
     test_server_.RegisterRequestHandler(
         base::Bind(&test_util::HandleDownloadFileRequest,
                    test_server_.base_url(),
                    base::Unretained(&http_request_)));
   }
 
   // Returns a temporary file path suitable for storing the cache file.
   base::FilePath GetTestCachedFilePath(const base::FilePath& file_name) {
     return temp_dir_.path().Append(file_name);
   }
 
   base::MessageLoopForIO message_loop_;  // Test server needs IO thread.
-  net::test_server::EmbeddedTestServer test_server_;
+  net::EmbeddedTestServer test_server_;
   scoped_ptr<RequestSender> request_sender_;
   scoped_refptr<net::TestURLRequestContextGetter> request_context_getter_;
   base::ScopedTempDir temp_dir_;
 
   // The incoming HTTP request is saved so tests can verify the request
   // parameters like HTTP method (ex. some requests should use DELETE
   // instead of GET).
   net::test_server::HttpRequest http_request_;
 };
 
@@ skipping 50 matching lines @@
     run_loop.Run();
   }
   EXPECT_EQ(HTTP_NOT_FOUND, result_code);
   EXPECT_EQ(net::test_server::METHOD_GET, http_request_.method);
   EXPECT_EQ("/files/gdata/no-such-file.txt",
             http_request_.relative_url);
   // Do not verify the not found message.
 }
 
 }  // namespace google_apis