Migrating tests to use EmbeddedTestServer (misc)

google_apis/drive/drive_api_requests_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 "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_reader.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 111 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(temp_dir_.CreateUniqueTempDir());
 
-    ASSERT_TRUE(test_server_.InitializeAndWaitUntilReady());
+    ASSERT_TRUE(test_server_.Start());
     test_server_.RegisterRequestHandler(
         base::Bind(&DriveApiRequestsTest::HandleChildrenDeleteRequest,
                    base::Unretained(this)));
     test_server_.RegisterRequestHandler(
         base::Bind(&DriveApiRequestsTest::HandleDataFileRequest,
                    base::Unretained(this)));
     test_server_.RegisterRequestHandler(
         base::Bind(&DriveApiRequestsTest::HandleDeleteRequest,
                    base::Unretained(this)));
     test_server_.RegisterRequestHandler(
@@ skipping 33 matching lines @@
     public_property.set_visibility(drive::Property::VISIBILITY_PUBLIC);
     public_property.set_key("key2");
     public_property.set_value("value2");
 
     testing_properties_.clear();
     testing_properties_.push_back(private_property);
     testing_properties_.push_back(public_property);
   }
 
   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_ptr<DriveApiUrlGenerator> url_generator_;
   scoped_refptr<net::TestURLRequestContextGetter> request_context_getter_;
   base::ScopedTempDir temp_dir_;
 
   // This is a path to the file which contains expected response from
   // the server. See also HandleDataFileRequest below.
   base::FilePath expected_data_file_path_;
 
   // This is a path string in the expected response header from the server
@@ skipping 2087 matching lines @@
                                     "Header: value\r\n"
                                     "\r\n"
                                     "BODY\r\n"
                                     "--BOUNDARY-- \t",
                                     &parts));
   ASSERT_EQ(1u, parts.size());
   EXPECT_EQ(HTTP_SUCCESS, parts[0].code);
   EXPECT_EQ("BODY", parts[0].body);
 }
 }  // namespace google_apis