Switch to standard integer types in chrome/browser/, part 1 of 4.

chrome/browser/devtools/device/usb/android_usb_device.cc

Index: chrome/browser/devtools/device/usb/android_usb_device.cc
diff --git a/chrome/browser/devtools/device/usb/android_usb_device.cc b/chrome/browser/devtools/device/usb/android_usb_device.cc
index 33efd00594e4f84f369ff5879c46a50e53fc9be3..e9e266a989757d9954c4236077b8c70c16ed41c0 100644
--- a/chrome/browser/devtools/device/usb/android_usb_device.cc
+++ b/chrome/browser/devtools/device/usb/android_usb_device.cc
@@ -45,8 +45,8 @@ const int kAdbProtocol = 0x1;
 
 const int kUsbTimeout = 0;
 
-const uint32 kMaxPayload = 4096;
-const uint32 kVersion = 0x01000000;
+const uint32_t kMaxPayload = 4096;
+const uint32_t kVersion = 0x01000000;
 
 static const char kHostConnectMessage[] = "host::";
 
@@ -88,10 +88,10 @@ void CountAndroidDevices(const base::Callback<void(int)>& callback,
                           base::Bind(callback, device_count));
 }
 
-uint32 Checksum(const std::string& data) {
+uint32_t Checksum(const std::string& data) {
   unsigned char* x = (unsigned char*)data.data();
   int count = data.length();
-  uint32 sum = 0;
+  uint32_t sum = 0;
   while (count-- > 0)
     sum += *x++;
   return sum;
@@ -290,12 +290,11 @@ void EnumerateOnUIThread(
 
 }  // namespace
 
-AdbMessage::AdbMessage(uint32 command,
-                       uint32 arg0,
-                       uint32 arg1,
+AdbMessage::AdbMessage(uint32_t command,
+                       uint32_t arg0,
+                       uint32_t arg1,
                        const std::string& body)
-    : command(command), arg0(arg0), arg1(arg1), body(body) {
-}
+    : command(command), arg0(arg0), arg1(arg1), body(body) {}
 
 AdbMessage::~AdbMessage() {
 }
@@ -362,15 +361,15 @@ net::StreamSocket* AndroidUsbDevice::CreateSocket(const std::string& command) {
   if (!usb_handle_.get())
     return NULL;
 
-  uint32 socket_id = ++last_socket_id_;
+  uint32_t socket_id = ++last_socket_id_;
   sockets_[socket_id] = new AndroidUsbSocket(this, socket_id, command,
       base::Bind(&AndroidUsbDevice::SocketDeleted, this, socket_id));
   return sockets_[socket_id];
 }
 
-void AndroidUsbDevice::Send(uint32 command,
-                            uint32 arg0,
-                            uint32 arg1,
+void AndroidUsbDevice::Send(uint32_t command,
+                            uint32_t arg0,
+                            uint32_t arg1,
                             const std::string& body) {
   scoped_ptr<AdbMessage> message(new AdbMessage(command, arg0, arg1, body));
   // Delay open request if not yet connected.
@@ -390,7 +389,7 @@ void AndroidUsbDevice::Queue(scoped_ptr<AdbMessage> message) {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   // Queue header.
-  std::vector<uint32> header;
+  std::vector<uint32_t> header;
   header.push_back(message->command);
   header.push_back(message->arg0);
   header.push_back(message->arg1);
@@ -487,13 +486,13 @@ void AndroidUsbDevice::ParseHeader(UsbTransferStatus status,
   }
 
   DumpMessage(false, buffer->data(), result);
-  std::vector<uint32> header(6);
+  std::vector<uint32_t> header(6);
   memcpy(&header[0], buffer->data(), result);
   scoped_ptr<AdbMessage> message(
       new AdbMessage(header[0], header[1], header[2], ""));
-  uint32 data_length = header[3];
-  uint32 data_check = header[4];
-  uint32 magic = header[5];
+  uint32_t data_length = header[3];
+  uint32_t data_check = header[4];
+  uint32_t magic = header[5];
   if ((message->command ^ 0xffffffff) != magic) {
     TransferError(device::USB_TRANSFER_ERROR);
     return;
@@ -511,8 +510,8 @@ void AndroidUsbDevice::ParseHeader(UsbTransferStatus status,
 }
 
 void AndroidUsbDevice::ReadBody(scoped_ptr<AdbMessage> message,
-                                uint32 data_length,
-                                uint32 data_check) {
+                                uint32_t data_length,
+                                uint32_t data_check) {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   if (!usb_handle_.get()) {
@@ -529,8 +528,8 @@ void AndroidUsbDevice::ReadBody(scoped_ptr<AdbMessage> message,
 }
 
 void AndroidUsbDevice::ParseBody(scoped_ptr<AdbMessage> message,
-                                 uint32 data_length,
-                                 uint32 data_check,
+                                 uint32_t data_length,
+                                 uint32_t data_check,
                                  UsbTransferStatus status,
                                  scoped_refptr<net::IOBuffer> buffer,
                                  size_t result) {
@@ -544,7 +543,7 @@ void AndroidUsbDevice::ParseBody(scoped_ptr<AdbMessage> message,
   }
 
   if (status != device::USB_TRANSFER_COMPLETED ||
-      static_cast<uint32>(result) != data_length) {
+      static_cast<uint32_t>(result) != data_length) {
     TransferError(status);
     return;
   }
@@ -567,7 +566,7 @@ void AndroidUsbDevice::HandleIncoming(scoped_ptr<AdbMessage> message) {
   switch (message->command) {
     case AdbMessage::kCommandAUTH:
       {
-        DCHECK_EQ(message->arg0, static_cast<uint32>(AdbMessage::kAuthToken));
+      DCHECK_EQ(message->arg0, static_cast<uint32_t>(AdbMessage::kAuthToken));
         if (signature_sent_) {
           Queue(make_scoped_ptr(new AdbMessage(
               AdbMessage::kCommandAUTH,
@@ -661,7 +660,7 @@ void AndroidUsbDevice::Terminate() {
       base::Bind(&ReleaseInterface, usb_handle, interface_id_));
 }
 
-void AndroidUsbDevice::SocketDeleted(uint32 socket_id) {
+void AndroidUsbDevice::SocketDeleted(uint32_t socket_id) {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   sockets_.erase(socket_id);