Switch to standard integer types in components/, part 4 of 4.

components/storage_monitor/storage_info.cc

 // 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.
 
 #include "components/storage_monitor/storage_info.h"
 
+#include <stddef.h>
+
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/storage_monitor/media_storage_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/text/bytes_formatting.h"
 
 namespace {
 
 // Prefix constants for different device id spaces.
 const char kRemovableMassStorageWithDCIMPrefix[] = "dcim:";
 const char kRemovableMassStorageNoDCIMPrefix[] = "nodcim:";
 const char kFixedMassStoragePrefix[] = "path:";
 const char kMtpPtpPrefix[] = "mtp:";
 const char kMacImageCapturePrefix[] = "ic:";
 const char kITunesPrefix[] = "itunes:";
 const char kPicasaPrefix[] = "picasa:";
 const char kIPhotoPrefix[] = "iphoto:";
 
-base::string16 GetDisplayNameForDevice(uint64 storage_size_in_bytes,
+base::string16 GetDisplayNameForDevice(uint64_t storage_size_in_bytes,
                                        const base::string16& name) {
   DCHECK(!name.empty());
   return (storage_size_in_bytes == 0) ?
       name :
       ui::FormatBytes(storage_size_in_bytes) + base::ASCIIToUTF16(" ") + name;
 }
 
 base::string16 GetFullProductName(const base::string16& vendor_name,
                                   const base::string16& model_name) {
   if (vendor_name.empty() && model_name.empty())
@@ skipping 15 matching lines @@
 namespace storage_monitor {
 
 StorageInfo::StorageInfo() : total_size_in_bytes_(0) {
 }
 
 StorageInfo::StorageInfo(const std::string& device_id_in,
                          const base::FilePath::StringType& device_location,
                          const base::string16& label,
                          const base::string16& vendor,
                          const base::string16& model,
-                         uint64 size_in_bytes)
+                         uint64_t size_in_bytes)
     : device_id_(device_id_in),
       location_(device_location),
       storage_label_(label),
       vendor_name_(vendor),
       model_name_(model),
-      total_size_in_bytes_(size_in_bytes) {
-}
+      total_size_in_bytes_(size_in_bytes) {}
 
 StorageInfo::~StorageInfo() {
 }
 
 // static
 std::string StorageInfo::MakeDeviceId(Type type, const std::string& unique_id) {
   DCHECK(!unique_id.empty());
   switch (type) {
     case REMOVABLE_MASS_STORAGE_WITH_DCIM:
       return std::string(kRemovableMassStorageWithDCIMPrefix) + unique_id;
@@ skipping 126 matching lines @@
     name = GetFullProductName(vendor_name_, model_name_);
   if (name.empty())
     name = base::ASCIIToUTF16("Unlabeled device");
 
   if (with_size)
     name = GetDisplayNameForDevice(total_size_in_bytes_, name);
   return name;
 }
 
 }  // namespace storage_monitor