Index: device/bluetooth/dbus/bluetooth_gatt_descriptor_service_provider.cc |
diff --git a/device/bluetooth/dbus/bluetooth_gatt_descriptor_service_provider.cc b/device/bluetooth/dbus/bluetooth_gatt_descriptor_service_provider.cc |
index e4aa24545539135a4369e606a73e97e4f67a87f7..36ae7efdd2d7d84ead293313a044c3596d5de1e2 100644 |
--- a/device/bluetooth/dbus/bluetooth_gatt_descriptor_service_provider.cc |
+++ b/device/bluetooth/dbus/bluetooth_gatt_descriptor_service_provider.cc |
@@ -4,8 +4,11 @@ |
#include "device/bluetooth/dbus/bluetooth_gatt_descriptor_service_provider.h" |
+#include <stddef.h> |
+ |
#include "base/bind.h" |
#include "base/logging.h" |
+#include "base/macros.h" |
#include "base/memory/weak_ptr.h" |
#include "base/strings/string_util.h" |
#include "base/threading/platform_thread.h" |
@@ -83,7 +86,7 @@ class BluetoothGattDescriptorServiceProviderImpl |
} |
// BluetoothGattDescriptorServiceProvider override. |
- void SendValueChanged(const std::vector<uint8>& value) override { |
+ void SendValueChanged(const std::vector<uint8_t>& value) override { |
VLOG(2) << "Emitting a PropertiesChanged signal for descriptor value."; |
dbus::Signal signal(dbus::kDBusPropertiesInterface, |
dbus::kDBusPropertiesChangedSignal); |
@@ -242,7 +245,7 @@ class BluetoothGattDescriptorServiceProviderImpl |
} |
// Obtain the value. |
- const uint8* bytes = NULL; |
+ const uint8_t* bytes = NULL; |
size_t length = 0; |
if (!variant_reader.PopArrayOfBytes(&bytes, &length)) { |
scoped_ptr<dbus::ErrorResponse> error_response = |
@@ -254,7 +257,7 @@ class BluetoothGattDescriptorServiceProviderImpl |
} |
// Pass the set request onto the delegate. |
- std::vector<uint8> value(bytes, bytes + length); |
+ std::vector<uint8_t> value(bytes, bytes + length); |
DCHECK(delegate_); |
delegate_->SetDescriptorValue( |
value, base::Bind(&BluetoothGattDescriptorServiceProviderImpl::OnSet, |
@@ -320,7 +323,7 @@ class BluetoothGattDescriptorServiceProviderImpl |
// descriptor value. |
void OnGetAll(dbus::MethodCall* method_call, |
dbus::ExportedObject::ResponseSender response_sender, |
- const std::vector<uint8>& value) { |
+ const std::vector<uint8_t>& value) { |
VLOG(2) << "Descriptor value obtained from delegate. Responding to " |
<< "GetAll."; |
@@ -362,7 +365,7 @@ class BluetoothGattDescriptorServiceProviderImpl |
// descriptor value. |
void OnGet(dbus::MethodCall* method_call, |
dbus::ExportedObject::ResponseSender response_sender, |
- const std::vector<uint8>& value) { |
+ const std::vector<uint8_t>& value) { |
VLOG(2) << "Returning descriptor value obtained from delegate."; |
scoped_ptr<dbus::Response> response = |
dbus::Response::FromMethodCall(method_call); |