1 files changed, 20 insertions, 18 deletions

diff --git a/chrome/browser/task_management/task_manager_interface.h b/chrome/browser/task_management/task_manager_interface.h
index 0a78f79..dd310ee 100644
--- a/chrome/browser/task_management/task_manager_interface.h
+++ b/chrome/browser/task_management/task_manager_interface.h
@@ -5,8 +5,10 @@
 #ifndef CHROME_BROWSER_TASK_MANAGEMENT_TASK_MANAGER_INTERFACE_H_
 #define CHROME_BROWSER_TASK_MANAGEMENT_TASK_MANAGER_INTERFACE_H_
 
+#include <stddef.h>
 #include <stdint.h>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/process/process_handle.h"
@@ -51,16 +53,16 @@ class TaskManagerInterface {
   // Returns the current physical/private/shared memory usage of the task with
   // |task_id| in bytes. A value of -1 means no valid value is currently
   // available.
-  virtual int64 GetPhysicalMemoryUsage(TaskId task_id) const = 0;
-  virtual int64 GetPrivateMemoryUsage(TaskId task_id) const = 0;
-  virtual int64 GetSharedMemoryUsage(TaskId task_id) const = 0;
+  virtual int64_t GetPhysicalMemoryUsage(TaskId task_id) const = 0;
+  virtual int64_t GetPrivateMemoryUsage(TaskId task_id) const = 0;
+  virtual int64_t GetSharedMemoryUsage(TaskId task_id) const = 0;
 
   // Returns the GPU memory usage of the task with |task_id| in bytes. A value
   // of -1 means no valid value is currently available.
   // |has_duplicates| will be set to true if this process' GPU resource count is
   // inflated because it is counting other processes' resources.
-  virtual int64 GetGpuMemoryUsage(TaskId task_id,
-                                  bool* has_duplicates) const = 0;
+  virtual int64_t GetGpuMemoryUsage(TaskId task_id,
+                                    bool* has_duplicates) const = 0;
 
   // Returns the number of average idle CPU wakeups per second since the last
   // refresh cycle. A value of -1 means no valid value is currently available.
@@ -74,11 +76,11 @@ class TaskManagerInterface {
   // On Windows, gets the current and peak number of GDI and USER handles in
   // use. A value of -1 means no valid value is currently available.
   virtual void GetGDIHandles(TaskId task_id,
-                             int64* current,
-                             int64* peak) const = 0;
+                             int64_t* current,
+                             int64_t* peak) const = 0;
   virtual void GetUSERHandles(TaskId task_id,
-                              int64* current,
-                              int64* peak) const = 0;
+                              int64_t* current,
+                              int64_t* peak) const = 0;
 
   // On Linux and ChromeOS, gets the number of file descriptors currently open
   // by the process on which the task with |task_id| is running, or -1 if no
@@ -116,25 +118,25 @@ class TaskManagerInterface {
   // cycle for the task with |task_id|. A value of -1 means no valid value is
   // currently available or that task has never been notified of any network
   // usage.
-  virtual int64 GetNetworkUsage(TaskId task_id) const = 0;
+  virtual int64_t GetNetworkUsage(TaskId task_id) const = 0;
 
   // Returns the total network usage (in bytes per second) during the current
   // refresh cycle for the process on which the task with |task_id| is running.
   // This is the sum of all the network usage of the individual tasks (that
   // can be gotten by the above GetNetworkUsage()). A value of -1 means network
   // usage calculation refresh is currently not available.
-  virtual int64 GetProcessTotalNetworkUsage(TaskId task_id) const = 0;
+  virtual int64_t GetProcessTotalNetworkUsage(TaskId task_id) const = 0;
 
   // Returns the Sqlite used memory (in bytes) for the task with |task_id|.
   // A value of -1 means no valid value is currently available.
-  virtual int64 GetSqliteMemoryUsed(TaskId task_id) const = 0;
+  virtual int64_t GetSqliteMemoryUsed(TaskId task_id) const = 0;
 
   // Returns the allocated and used V8 memory (in bytes) for the task with
   // |task_id|. A return value of false means no valid value is currently
   // available.
   virtual bool GetV8Memory(TaskId task_id,
-                           int64* allocated,
-                           int64* used) const = 0;
+                           int64_t* allocated,
+                           int64_t* used) const = 0;
 
   // Gets the Webkit resource cache stats for the task with |task_id|.
   // A return value of false means that task does NOT report WebCache stats.
@@ -178,7 +180,7 @@ class TaskManagerInterface {
   // will return base::TimeDelta::Max() if the task manager is not running.
   base::TimeDelta GetCurrentRefreshTime() const;
 
-  int64 enabled_resources_flags() const { return enabled_resources_flags_; }
+  int64_t enabled_resources_flags() const { return enabled_resources_flags_; }
 
   void set_timer_for_testing(scoped_ptr<base::Timer> timer) {
     refresh_timer_ = timer.Pass();
@@ -192,10 +194,10 @@ class TaskManagerInterface {
   void RecalculateRefreshFlags();
 
   // Appends |flags| to the |enabled_resources_flags_|.
-  void ResourceFlagsAdded(int64 flags);
+  void ResourceFlagsAdded(int64_t flags);
 
   // Sets |enabled_resources_flags_| to |flags|.
-  void SetEnabledResourceFlags(int64 flags);
+  void SetEnabledResourceFlags(int64_t flags);
 
   // Schedules the task manager refresh cycles using the given |refresh_time|.
   // It stops any existing refresh schedule.
@@ -208,7 +210,7 @@ class TaskManagerInterface {
   scoped_ptr<base::Timer> refresh_timer_;
 
   // The flags containing the enabled resources types calculations.
-  int64 enabled_resources_flags_;
+  int64_t enabled_resources_flags_;
 
   DISALLOW_COPY_AND_ASSIGN(TaskManagerInterface);
 };