Switch to standard integer types in device/.

device/bluetooth/dbus/bluetooth_agent_service_provider.cc

 // 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.
 
 #include "device/bluetooth/dbus/bluetooth_agent_service_provider.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/platform_thread.h"
 #include "dbus/exported_object.h"
 #include "dbus/message.h"
 #include "device/bluetooth/dbus/bluez_dbus_manager.h"
 #include "device/bluetooth/dbus/fake_bluetooth_agent_service_provider.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace bluez {
 
@@ skipping 177 matching lines @@
   // Called by dbus:: when the Bluetooth daemon requires that the user
   // enter a Passkey into the remote device so that it may be
   // authenticated.
   void DisplayPasskey(dbus::MethodCall* method_call,
                       dbus::ExportedObject::ResponseSender response_sender) {
     DCHECK(OnOriginThread());
     DCHECK(delegate_);
 
     dbus::MessageReader reader(method_call);
     dbus::ObjectPath device_path;
-    uint32 passkey;
-    uint16 entered;
+    uint32_t passkey;
+    uint16_t entered;
     if (!reader.PopObjectPath(&device_path) || !reader.PopUint32(&passkey) ||
         !reader.PopUint16(&entered)) {
       LOG(WARNING) << "DisplayPasskey called with incorrect paramters: "
                    << method_call->ToString();
       return;
     }
 
     delegate_->DisplayPasskey(device_path, passkey, entered);
 
     response_sender.Run(dbus::Response::FromMethodCall(method_call));
   }
 
   // Called by dbus:: when the Bluetooth daemon requires that the user
   // confirm that a Passkey is displayed on the screen of the remote
   // device so that it may be authenticated.
   void RequestConfirmation(
       dbus::MethodCall* method_call,
       dbus::ExportedObject::ResponseSender response_sender) {
     DCHECK(OnOriginThread());
     DCHECK(delegate_);
 
     dbus::MessageReader reader(method_call);
     dbus::ObjectPath device_path;
-    uint32 passkey;
+    uint32_t passkey;
     if (!reader.PopObjectPath(&device_path) || !reader.PopUint32(&passkey)) {
       LOG(WARNING) << "RequestConfirmation called with incorrect paramters: "
                    << method_call->ToString();
       return;
     }
 
     Delegate::ConfirmationCallback callback = base::Bind(
         &BluetoothAgentServiceProviderImpl::OnConfirmation,
         weak_ptr_factory_.GetWeakPtr(), method_call, response_sender);
 
@@ skipping 95 matching lines @@
       }
       default:
         NOTREACHED() << "Unexpected status code from delegate: " << status;
     }
   }
 
   // Called by the Delegate to response to a method requesting a Passkey.
   void OnPasskey(dbus::MethodCall* method_call,
                  dbus::ExportedObject::ResponseSender response_sender,
                  Delegate::Status status,
-                 uint32 passkey) {
+                 uint32_t passkey) {
     DCHECK(OnOriginThread());
 
     switch (status) {
       case Delegate::SUCCESS: {
         scoped_ptr<dbus::Response> response(
             dbus::Response::FromMethodCall(method_call));
         dbus::MessageWriter writer(response.get());
         writer.AppendUint32(passkey);
         response_sender.Run(response.Pass());
         break;
@@ skipping 77 matching lines @@
     const dbus::ObjectPath& object_path,
     Delegate* delegate) {
   if (!bluez::BluezDBusManager::Get()->IsUsingStub()) {
     return new BluetoothAgentServiceProviderImpl(bus, object_path, delegate);
   } else {
     return new FakeBluetoothAgentServiceProvider(object_path, delegate);
   }
 }
 
 }  // namespace bluez