Switch to standard integer types in device/.

device/bluetooth/dbus/fake_bluetooth_gatt_characteristic_client.h

 // 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.
 
 #ifndef DEVICE_BLUETOOTH_DBUS_FAKE_BLUETOOTH_GATT_CHARACTERISTIC_CLIENT_H_
 #define DEVICE_BLUETOOTH_DBUS_FAKE_BLUETOOTH_GATT_CHARACTERISTIC_CLIENT_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "dbus/object_path.h"
 #include "dbus/property.h"
 #include "device/bluetooth/bluetooth_export.h"
 #include "device/bluetooth/dbus/bluetooth_gatt_characteristic_client.h"
 
 namespace bluez {
 
@@ skipping 23 matching lines @@
 
   // BluetoothGattCharacteristicClient overrides.
   void AddObserver(Observer* observer) override;
   void RemoveObserver(Observer* observer) override;
   std::vector<dbus::ObjectPath> GetCharacteristics() override;
   Properties* GetProperties(const dbus::ObjectPath& object_path) override;
   void ReadValue(const dbus::ObjectPath& object_path,
                  const ValueCallback& callback,
                  const ErrorCallback& error_callback) override;
   void WriteValue(const dbus::ObjectPath& object_path,
-                  const std::vector<uint8>& value,
+                  const std::vector<uint8_t>& value,
                   const base::Closure& callback,
                   const ErrorCallback& error_callback) override;
   void StartNotify(const dbus::ObjectPath& object_path,
                    const base::Closure& callback,
                    const ErrorCallback& error_callback) override;
   void StopNotify(const dbus::ObjectPath& object_path,
                   const base::Closure& callback,
                   const ErrorCallback& error_callback) override;
 
   // Makes the group of characteristics belonging to a particular GATT based
@@ skipping 53 matching lines @@
   void NotifyCharacteristicAdded(const dbus::ObjectPath& object_path);
   void NotifyCharacteristicRemoved(const dbus::ObjectPath& object_path);
 
   // Schedules a heart rate measurement value change, if the heart rate
   // characteristics are visible.
   void ScheduleHeartRateMeasurementValueChange();
 
   // Returns a random Heart Rate Measurement value. All the fields of the value
   // are populated according to the the fake behavior. The measurement value
   // is a random value within a reasonable range.
-  std::vector<uint8> GetHeartRateMeasurementValue();
+  std::vector<uint8_t> GetHeartRateMeasurementValue();
 
   // Callback that executes a delayed ReadValue action by updating the
   // appropriate "Value" property and invoking the ValueCallback.
   void DelayedReadValueCallback(const dbus::ObjectPath& object_path,
                                 const ValueCallback& callback,
                                 const std::vector<uint8_t>& value);
 
   // If true, characteristics of the Heart Rate Service are visible. Use
   // IsHeartRateVisible() to check the value.
   bool heart_rate_visible_;
 
   // If true, the client is authorized to read and write.
   bool authorized_;
 
   // If true, the client is authenticated.
   bool authenticated_;
 
   // Total calories burned, used for the Heart Rate Measurement characteristic.
-  uint16 calories_burned_;
+  uint16_t calories_burned_;
 
   // Static properties returned for simulated characteristics for the Heart
   // Rate Service. These pointers are not NULL only if the characteristics are
   // actually exposed.
   scoped_ptr<Properties> heart_rate_measurement_properties_;
   scoped_ptr<Properties> body_sensor_location_properties_;
   scoped_ptr<Properties> heart_rate_control_point_properties_;
 
   // Object paths of the exposed characteristics. If a characteristic is not
   // exposed, these will be empty.
@@ skipping 26 matching lines @@
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<FakeBluetoothGattCharacteristicClient> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeBluetoothGattCharacteristicClient);
 };
 
 }  // namespace bluez
 
 #endif  // DEVICE_BLUETOOTH_DBUS_FAKE_BLUETOOTH_GATT_CHARACTERISTIC_CLIENT_H_