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

components/storage_monitor/storage_monitor_linux_unittest.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.
 
 // StorageMonitorLinux unit tests.
 
 #include "components/storage_monitor/storage_monitor_linux.h"
 
 #include <mntent.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <stdio.h>
 
 #include <string>
 
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "components/storage_monitor/mock_removable_storage_observer.h"
 #include "components/storage_monitor/removable_device_constants.h"
 #include "components/storage_monitor/storage_info.h"
 #include "components/storage_monitor/storage_monitor.h"
 #include "components/storage_monitor/test_media_transfer_protocol_manager_linux.h"
 #include "components/storage_monitor/test_storage_monitor.h"
@@ skipping 18 matching lines @@
 const char kInvalidDevice[] = "invalid_device";
 
 const char kMountPointA[] = "mnt_a";
 const char kMountPointB[] = "mnt_b";
 const char kMountPointC[] = "mnt_c";
 
 struct TestDeviceData {
   const char* device_path;
   const char* unique_id;
   StorageInfo::Type type;
-  uint64 partition_size_in_bytes;
+  uint64_t partition_size_in_bytes;
 };
 
 const TestDeviceData kTestDeviceData[] = {
   { kDeviceDCIM1, "UUID:FFF0-000F",
     StorageInfo::REMOVABLE_MASS_STORAGE_WITH_DCIM, 88788 },
   { kDeviceDCIM2, "VendorModelSerial:ComName:Model2010:8989",
     StorageInfo::REMOVABLE_MASS_STORAGE_WITH_DCIM,
     8773 },
   { kDeviceDCIM3, "VendorModelSerial:::WEM319X792",
     StorageInfo::REMOVABLE_MASS_STORAGE_WITH_DCIM, 22837 },
@@ skipping 24 matching lines @@
   storage_info.reset(new StorageInfo(
       StorageInfo::MakeDeviceId(type, kTestDeviceData[i].unique_id),
       mount_point.value(),
       base::ASCIIToUTF16("volume label"),
       base::ASCIIToUTF16("vendor name"),
       base::ASCIIToUTF16("model name"),
       kTestDeviceData[i].partition_size_in_bytes));
   return storage_info.Pass();
 }
 
-uint64 GetDevicePartitionSize(const std::string& device) {
+uint64_t GetDevicePartitionSize(const std::string& device) {
   for (size_t i = 0; i < arraysize(kTestDeviceData); ++i) {
     if (device == kTestDeviceData[i].device_path)
       return kTestDeviceData[i].partition_size_in_bytes;
   }
   return 0;
 }
 
 std::string GetDeviceId(const std::string& device) {
   for (size_t i = 0; i < arraysize(kTestDeviceData); ++i) {
     if (device == kTestDeviceData[i].device_path) {
@@ skipping 123 matching lines @@
   }
 
   MockRemovableStorageObserver& observer() {
     return *mock_storage_observer_;
   }
 
   StorageMonitor* notifier() {
     return monitor_.get();
   }
 
-  uint64 GetStorageSize(const base::FilePath& path) {
+  uint64_t GetStorageSize(const base::FilePath& path) {
     StorageInfo info;
     if (!notifier()->GetStorageInfoForPath(path, &info))
       return 0;
 
     return info.total_size_in_bytes();
   }
 
  private:
   // Create a directory named |dir| relative to the test directory.
   // Set |with_dcim_dir| to true if the created directory will have a "DCIM"
@@ skipping 422 matching lines @@
             GetStorageSize(test_path_a));
   EXPECT_EQ(GetDevicePartitionSize(kDeviceNoDCIM),
             GetStorageSize(test_path_b));
   EXPECT_EQ(GetDevicePartitionSize(kInvalidPath),
             GetStorageSize(base::FilePath(kInvalidPath)));
 }
 
 }  // namespace
 
 }  // namespace storage_monitor