Switch to standard integer types in device/.

device/test/usb_test_gadget_impl.cc

 // Copyright 2014 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 "device/test/usb_test_gadget.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ skipping 45 matching lines @@
 };
 
 namespace {
 
 static const char kCommandLineSwitch[] = "enable-gadget-tests";
 static const int kReenumeratePeriod = 100;  // 0.1 seconds
 
 struct UsbTestGadgetConfiguration {
   UsbTestGadget::Type type;
   const char* http_resource;
-  uint16 product_id;
+  uint16_t product_id;
 };
 
 static const struct UsbTestGadgetConfiguration kConfigurations[] = {
     {UsbTestGadget::DEFAULT, "/unconfigure", 0x58F0},
     {UsbTestGadget::KEYBOARD, "/keyboard/configure", 0x58F1},
     {UsbTestGadget::MOUSE, "/mouse/configure", 0x58F2},
     {UsbTestGadget::HID_ECHO, "/hid_echo/configure", 0x58F3},
     {UsbTestGadget::ECHO, "/echo/configure", 0x58F4},
 };
 
@@ skipping 111 matching lines @@
 }
 
 class UsbGadgetFactory : public UsbService::Observer,
                          public net::URLFetcherDelegate {
  public:
   UsbGadgetFactory(scoped_refptr<base::SingleThreadTaskRunner> io_task_runner)
       : observer_(this), weak_factory_(this) {
     usb_service_ = DeviceClient::Get()->GetUsbService();
     request_context_getter_ = new URLRequestContextGetter(io_task_runner);
 
-    static uint32 next_session_id;
+    static uint32_t next_session_id;
     base::ProcessId process_id = base::GetCurrentProcId();
     session_id_ = base::StringPrintf("%d-%d", process_id, next_session_id++);
 
     observer_.Add(usb_service_);
   }
 
   ~UsbGadgetFactory() override {}
 
   scoped_ptr<UsbTestGadget> WaitForDevice() {
     EnumerateDevices();
@@ skipping 202 matching lines @@
  private:
   void OnDevicesEnumerated(
       const std::vector<scoped_refptr<UsbDevice>>& devices) {
     for (const scoped_refptr<UsbDevice>& device : devices) {
       OnDeviceAdded(device);
     }
   }
 
   void OnDeviceAdded(scoped_refptr<UsbDevice> device) override {
     if (device->vendor_id() == 0x18D1 && !device->serial_number().empty()) {
-      const uint16 product_id = device->product_id();
+      const uint16_t product_id = device->product_id();
       if (product_id_ == -1) {
         bool found = false;
         for (size_t i = 0; i < arraysize(kConfigurations); ++i) {
           if (product_id == kConfigurations[i].product_id) {
             found = true;
             break;
           }
         }
         if (!found) {
           return;
@@ skipping 170 matching lines @@
     return false;
   }
 
   DeviceAddListener add_listener(usb_service_, device_address_, -1);
   device_ = add_listener.WaitForAdd();
   DCHECK(device_.get());
   return true;
 }
 
 }  // namespace device