Switch to standard integer types in chromeos/.

chromeos/dbus/cros_disks_client.h

 // Copyright (c) 2012 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_CROS_DISKS_CLIENT_H_
 #define CHROMEOS_DBUS_CROS_DISKS_CLIENT_H_
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/callback_forward.h"
+#include "base/macros.h"
 #include "chromeos/chromeos_export.h"
 #include "chromeos/dbus/dbus_client.h"
 #include "chromeos/dbus/dbus_client_implementation_type.h"
 
 namespace base {
 class FilePath;
 }
 
 namespace dbus {
 class MessageReader;
@@ skipping 123 matching lines @@
   // Product name of the device (e.g. "Nexus One").
   const std::string& product_name() const { return product_name_; }
 
   // Disk model. (e.g. "TransMemory")
   const std::string& drive_label() const { return drive_model_; }
 
   // Device type. Not working well, yet.
   DeviceType device_type() const { return device_type_; }
 
   // Total size of the disk in bytes.
-  uint64 total_size_in_bytes() const { return total_size_in_bytes_; }
+  uint64_t total_size_in_bytes() const { return total_size_in_bytes_; }
 
   // Is the device read-only.
   bool is_read_only() const { return is_read_only_; }
 
   // Returns true if the device should be hidden from the file browser.
   bool is_hidden() const { return is_hidden_; }
 
   // Returns file system uuid.
   const std::string& uuid() const { return uuid_; }
 
  private:
   void InitializeFromResponse(dbus::Response* response);
 
   std::string device_path_;
   std::string mount_path_;
   std::string system_path_;
   bool is_drive_;
   bool has_media_;
   bool on_boot_device_;
   bool on_removable_device_;
 
   std::string file_path_;
   std::string label_;
   std::string vendor_id_;
   std::string vendor_name_;
   std::string product_id_;
   std::string product_name_;
   std::string drive_model_;
   DeviceType device_type_;
-  uint64 total_size_in_bytes_;
+  uint64_t total_size_in_bytes_;
   bool is_read_only_;
   bool is_hidden_;
   std::string uuid_;
 };
 
 // A struct to represent information about a mount point sent from cros-disks.
 struct CHROMEOS_EXPORT MountEntry {
  public:
   MountEntry()
       : error_code_(MOUNT_ERROR_UNKNOWN), mount_type_(MOUNT_TYPE_INVALID) {
@@ skipping 136 matching lines @@
   // Create() should be used instead.
   CrosDisksClient();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CrosDisksClient);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_CROS_DISKS_CLIENT_H_