Migrating tests to use EmbeddedTestServer (misc)

sync/internal_api/attachments/attachment_uploader_impl_unittest.cc

Index: sync/internal_api/attachments/attachment_uploader_impl_unittest.cc
diff --git a/sync/internal_api/attachments/attachment_uploader_impl_unittest.cc b/sync/internal_api/attachments/attachment_uploader_impl_unittest.cc
index ce545bec6222019278a0e225f869fc03665f569f..bd0ae513ab2f9e36e8ea0d16931eb6e6d686968a 100644
--- a/sync/internal_api/attachments/attachment_uploader_impl_unittest.cc
+++ b/sync/internal_api/attachments/attachment_uploader_impl_unittest.cc
@@ -224,7 +224,7 @@ class AttachmentUploaderImplTest : public testing::Test,
   scoped_ptr<RequestHandler> request_handler_;
   scoped_ptr<AttachmentUploader> uploader_;
   AttachmentUploader::UploadCallback upload_callback_;
-  net::test_server::EmbeddedTestServer server_;
+  net::EmbeddedTestServer server_;
   // A closure that signals an upload has finished.
   base::Closure signal_upload_done_;
   std::vector<HttpRequest> http_requests_received_;
@@ -282,7 +282,7 @@ void AttachmentUploaderImplTest::SetUp() {
   url_request_context_getter_ =
       new net::TestURLRequestContextGetter(message_loop_.task_runner());
 
-  ASSERT_TRUE(server_.InitializeAndWaitUntilReady());
+  ASSERT_TRUE(server_.Start());
   server_.RegisterRequestHandler(
       base::Bind(&RequestHandler::HandleRequest,
                  base::Unretained(request_handler_.get())));