Switch to standard integer types in chromeos/.

chromeos/dbus/nfc_client_helpers.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 CHROMEOS_DBUS_NFC_CLIENT_HELPERS_H_
 #define CHROMEOS_DBUS_NFC_CLIENT_HELPERS_H_
 
 #include <map>
 #include <string>
 #include <utility>
 
-#include "base/basictypes.h"
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/values.h"
 #include "chromeos/chromeos_export.h"
 #include "chromeos/dbus/nfc_property_set.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 
 namespace chromeos {
 namespace nfc_client_helpers {
@@ skipping 173 matching lines @@
   typedef std::map<dbus::ObjectPath, DBusObjectMap*> PathsToObjectMapsType;
   PathsToObjectMapsType paths_to_object_maps_;
 
   DISALLOW_COPY_AND_ASSIGN(ObjectProxyTree);
 };
 
 }  // namespace nfc_client_helpers
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_NFC_CLIENT_HELPERS_H_