Switch to standard integer types in chrome/browser/chromeos/.

chrome/browser/chromeos/policy/device_status_collector.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 CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_STATUS_COLLECTOR_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_STATUS_COLLECTOR_H_
 
+#include <stdint.h>
+
 #include <deque>
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/callback_list.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chromeos/system/version_loader.h"
 #include "content/public/browser/geolocation_provider.h"
 #include "content/public/common/geoposition.h"
@@ skipping 115 matching lines @@
   unsigned int max_stored_future_activity_days_;
 
  private:
   // Prevents the local store of activity periods from growing too large by
   // removing entries that are outside the reporting window.
   void PruneStoredActivityPeriods(base::Time base_time);
 
   // Trims the store activity periods to only retain data within the
   // [|min_day_key|, |max_day_key|). The record for |min_day_key| will be
   // adjusted by subtracting |min_day_trim_duration|.
-  void TrimStoredActivityPeriods(int64 min_day_key,
+  void TrimStoredActivityPeriods(int64_t min_day_key,
                                  int min_day_trim_duration,
-                                 int64 max_day_key);
+                                 int64_t max_day_key);
 
   void AddActivePeriod(base::Time start, base::Time end);
 
   // Clears the cached hardware status.
   void ClearCachedHardwareStatus();
 
   // Callbacks from chromeos::VersionLoader.
   void OnOSVersion(const std::string& version);
   void OnOSFirmware(const std::string& version);
 
@@ skipping 38 matching lines @@
 
   PrefService* local_state_;
 
   // The last time an idle state check was performed.
   base::Time last_idle_check_;
 
   // The maximum key that went into the last report generated by
   // GetDeviceStatus(), and the duration for it. This is used to trim the
   // stored data in OnSubmittedSuccessfully(). Trimming is delayed so
   // unsuccessful uploads don't result in dropped data.
-  int64 last_reported_day_;
+  int64_t last_reported_day_;
   int duration_for_last_reported_day_;
 
   // Whether a geolocation update is currently in progress.
   bool geolocation_update_in_progress_;
 
   base::RepeatingTimer idle_poll_timer_;
   base::RepeatingTimer hardware_status_sampling_timer_;
   base::OneShotTimer geolocation_update_timer_;
 
   std::string os_version_;
   std::string firmware_version_;
 
   content::Geoposition position_;
 
   // Cached disk volume information.
   std::vector<enterprise_management::VolumeInfo> volume_info_;
 
   // Cached CPU temp information.
   std::vector<enterprise_management::CPUTempInfo> cpu_temp_info_;
 
   struct ResourceUsage {
     // Sample of percentage-of-CPU-used.
     int cpu_usage_percent;
 
     // Amount of free RAM (measures raw memory used by processes, not internal
     // memory waiting to be reclaimed by GC).
-    int64 bytes_of_ram_free;
+    int64_t bytes_of_ram_free;
   };
 
   // Samples of resource usage (contains multiple samples taken
   // periodically every kHardwareStatusSampleIntervalSeconds).
   std::deque<ResourceUsage> resource_usage_;
 
   // Callback invoked to fetch information about the mounted disk volumes.
   VolumeInfoFetcher volume_info_fetcher_;
 
   // Callback invoked to fetch information about cpu usage.
   CPUStatisticsFetcher cpu_statistics_fetcher_;
 
   // Callback invoked to fetch information about cpu temperature.
   CPUTempFetcher cpu_temp_fetcher_;
 
   chromeos::system::StatisticsProvider* statistics_provider_;
 
   chromeos::CrosSettings* cros_settings_;
 
   // The most recent CPU readings.
-  uint64 last_cpu_active_;
-  uint64 last_cpu_idle_;
+  uint64_t last_cpu_active_;
+  uint64_t last_cpu_idle_;
 
   // TODO(bartfab): Remove this once crbug.com/125931 is addressed and a proper
   // way to mock geolocation exists.
   LocationUpdateRequester location_update_requester_;
 
   scoped_ptr<content::GeolocationProvider::Subscription>
       geolocation_subscription_;
 
   // Cached values of the reporting settings from the device policy.
   bool report_version_info_;
@@ skipping 23 matching lines @@
       session_status_subscription_;
 
   base::WeakPtrFactory<DeviceStatusCollector> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceStatusCollector);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_STATUS_COLLECTOR_H_