Switch to standard integer types in net/.

net/socket/transport_client_socket_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 <string>
 
-#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "net/base/address_list.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/log/net_log.h"
@@ skipping 33 matching lines @@
     // delete the connected_sock_, which will close it.
     connected_sock_.reset();
   }
 
   void AcceptCallback(int res) {
     ASSERT_EQ(OK, res);
     connect_loop_.Quit();
   }
 
   int DrainClientSocket(IOBuffer* buf,
-                        uint32 buf_len,
-                        uint32 bytes_to_read,
+                        uint32_t buf_len,
+                        uint32_t bytes_to_read,
                         TestCompletionCallback* callback);
 
   // Establishes a connection to the server.
   void EstablishConnection(TestCompletionCallback* callback);
 
   // Sends a request from the client to the server socket. Makes the server read
   // the request and send a response.
   void SendRequestAndResponse();
 
   // Makes |connected_sock_| to read |expected_bytes_read| bytes. Returns the
   // the data read as a string.
   std::string ReadServerData(int expected_bytes_read);
 
   // Sends server response.
   void SendServerResponse();
 
   void set_close_server_socket_on_next_send(bool close) {
     close_server_socket_on_next_send_ = close;
   }
 
  protected:
   base::RunLoop connect_loop_;
-  uint16 listen_port_;
+  uint16_t listen_port_;
   TestNetLog net_log_;
   ClientSocketFactory* const socket_factory_;
   scoped_ptr<StreamSocket> sock_;
   scoped_ptr<StreamSocket> connected_sock_;
 
  private:
   scoped_ptr<TCPServerSocket> listen_sock_;
   bool close_server_socket_on_next_send_;
 };
 
@@ skipping 22 matching lines @@
                              NULL, BoundNetLog());
   CHECK_EQ(ERR_IO_PENDING, rv);
   rv = callback.WaitForResult();
   CHECK_EQ(rv, OK);
   sock_ = socket_factory_->CreateTransportClientSocket(addr, &net_log_,
                                                        NetLog::Source());
 }
 
 int TransportClientSocketTest::DrainClientSocket(
     IOBuffer* buf,
-    uint32 buf_len,
-    uint32 bytes_to_read,
+    uint32_t buf_len,
+    uint32_t bytes_to_read,
     TestCompletionCallback* callback) {
   int rv = OK;
-  uint32 bytes_read = 0;
+  uint32_t bytes_read = 0;
 
   while (bytes_read < bytes_to_read) {
     rv = sock_->Read(buf, buf_len, callback->callback());
     EXPECT_TRUE(rv >= 0 || rv == ERR_IO_PENDING);
     rv = callback->GetResult(rv);
     EXPECT_GT(rv, 0);
     bytes_read += rv;
   }
 
   return static_cast<int>(bytes_read);
@@ skipping 110 matching lines @@
   EXPECT_TRUE(
       LogContainsEndEvent(net_log_entries, -1, NetLog::TYPE_TCP_CONNECT));
 
   sock_->Disconnect();
   EXPECT_FALSE(sock_->IsConnected());
 }
 
 TEST_P(TransportClientSocketTest, IsConnected) {
   scoped_refptr<IOBuffer> buf(new IOBuffer(4096));
   TestCompletionCallback callback;
-  uint32 bytes_read;
+  uint32_t bytes_read;
 
   EXPECT_FALSE(sock_->IsConnected());
   EXPECT_FALSE(sock_->IsConnectedAndIdle());
 
   EstablishConnection(&callback);
 
   EXPECT_TRUE(sock_->IsConnected());
   EXPECT_TRUE(sock_->IsConnectedAndIdle());
 
   // Send the request and wait for the server to respond.
@@ skipping 44 matching lines @@
   EXPECT_FALSE(sock_->IsConnectedAndIdle());
 }
 
 TEST_P(TransportClientSocketTest, Read) {
   TestCompletionCallback callback;
   EstablishConnection(&callback);
 
   SendRequestAndResponse();
 
   scoped_refptr<IOBuffer> buf(new IOBuffer(4096));
-  uint32 bytes_read =
+  uint32_t bytes_read =
       DrainClientSocket(buf.get(), 4096, strlen(kServerReply), &callback);
   ASSERT_EQ(bytes_read, strlen(kServerReply));
   ASSERT_EQ(std::string(kServerReply), std::string(buf->data(), bytes_read));
 
   // All data has been read now.  Read once more to force an ERR_IO_PENDING, and
   // then close the server socket, and note the close.
 
   int rv = sock_->Read(buf.get(), 4096, callback.callback());
   ASSERT_EQ(ERR_IO_PENDING, rv);
   CloseServerSocket();
   EXPECT_EQ(0, callback.WaitForResult());
 }
 
 TEST_P(TransportClientSocketTest, Read_SmallChunks) {
   TestCompletionCallback callback;
   EstablishConnection(&callback);
 
   SendRequestAndResponse();
 
   scoped_refptr<IOBuffer> buf(new IOBuffer(1));
-  uint32 bytes_read = 0;
+  uint32_t bytes_read = 0;
   while (bytes_read < strlen(kServerReply)) {
     int rv = sock_->Read(buf.get(), 1, callback.callback());
     EXPECT_TRUE(rv >= 0 || rv == ERR_IO_PENDING);
 
     rv = callback.GetResult(rv);
 
     ASSERT_EQ(1, rv);
     bytes_read += rv;
   }
 
@@ skipping 104 matching lines @@
 
   // It's possible the read is blocked because it's already read all the data.
   // Close the server socket, so there will at least be a 0-byte read.
   CloseServerSocket();
 
   rv = callback.WaitForResult();
   EXPECT_GE(rv, 0);
 }
 
 }  // namespace net