Switch to standard integer types in content/browser/.

content/browser/gamepad/xbox_data_fetcher_mac.h

 // Copyright 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.
 
 #ifndef CONTENT_BROWSER_GAMEPAD_XBOX_DATA_FETCHER_MAC_H_
 #define CONTENT_BROWSER_GAMEPAD_XBOX_DATA_FETCHER_MAC_H_
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <IOKit/IOKitLib.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include <set>
 
-#include "base/basictypes.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_ioobject.h"
 #include "base/mac/scoped_ioplugininterface.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 
 class XboxController {
  public:
   enum ControllerType {
     UNKNOWN_CONTROLLER,
     XBOX_360_CONTROLLER,
     XBOX_ONE_CONTROLLER
   };
 
@@ skipping 82 matching lines @@
   bool interface_is_open_;
 
   base::ScopedCFTypeRef<CFRunLoopSourceRef> source_;
 
   // This will be set to the max packet size reported by the interface, which
   // is 32 bytes. I would have expected USB to do message framing itself, but
   // somehow we still sometimes (rarely!) get packets off the interface which
   // aren't correctly framed. The 360 controller frames its packets with a 2
   // byte header (type, total length) so we can reframe the packet data
   // ourselves.
-  uint16 read_buffer_size_;
-  scoped_ptr<uint8[]> read_buffer_;
+  uint16_t read_buffer_size_;
+  scoped_ptr<uint8_t[]> read_buffer_;
 
   // The pattern that the LEDs on the device are currently displaying, or
   // LED_NUM_PATTERNS if unknown.
   LEDPattern led_pattern_;
 
   UInt32 location_id_;
 
   Delegate* delegate_;
 
   ControllerType controller_type_;
@@ skipping 24 matching lines @@
     base::mac::ScopedIOObject<io_iterator_t>* removed_iter);
   void UnregisterFromNotifications();
 
   XboxController* ControllerForLocation(UInt32 location_id);
 
  private:
   static void DeviceAdded(void* context, io_iterator_t iterator);
   static void DeviceRemoved(void* context, io_iterator_t iterator);
   void AddController(XboxController* controller);
   void RemoveController(XboxController* controller);
-  void RemoveControllerByLocationID(uint32 id);
+  void RemoveControllerByLocationID(uint32_t id);
   void XboxControllerGotData(XboxController* controller,
                              const XboxController::Data& data) override;
   void XboxControllerError(XboxController* controller) override;
 
   Delegate* delegate_;
 
   std::set<XboxController*> controllers_;
 
   bool listening_;
 
   // port_ owns source_, so this doesn't need to be a ScopedCFTypeRef, but we
   // do need to maintain a reference to it so we can invalidate it.
   CFRunLoopSourceRef source_;
   IONotificationPortRef port_;
   base::mac::ScopedIOObject<io_iterator_t> xbox_360_device_added_iter_;
   base::mac::ScopedIOObject<io_iterator_t> xbox_360_device_removed_iter_;
   base::mac::ScopedIOObject<io_iterator_t> xbox_one_device_added_iter_;
   base::mac::ScopedIOObject<io_iterator_t> xbox_one_device_removed_iter_;
 
   DISALLOW_COPY_AND_ASSIGN(XboxDataFetcher);
 };
 
 #endif  // CONTENT_BROWSER_GAMEPAD_XBOX_DATA_FETCHER_MAC_H_