| Index: chrome/browser/task_management/sampling/task_manager_impl.cc
 | 
| diff --git a/chrome/browser/task_management/sampling/task_manager_impl.cc b/chrome/browser/task_management/sampling/task_manager_impl.cc
 | 
| index e44a0dab8ede3cbc6aaf404237251f1edd1e8b30..9f6e87b84e18daf5c050a39d91e3f503e297b6f8 100644
 | 
| --- a/chrome/browser/task_management/sampling/task_manager_impl.cc
 | 
| +++ b/chrome/browser/task_management/sampling/task_manager_impl.cc
 | 
| @@ -6,6 +6,7 @@
 | 
|  
 | 
|  #include "base/command_line.h"
 | 
|  #include "base/stl_util.h"
 | 
| +#include "build/build_config.h"
 | 
|  #include "chrome/browser/task_management/providers/browser_process_task_provider.h"
 | 
|  #include "chrome/browser/task_management/providers/child_process_task_provider.h"
 | 
|  #include "chrome/browser/task_management/providers/web_contents/web_contents_task_provider.h"
 | 
| @@ -75,20 +76,20 @@ double TaskManagerImpl::GetCpuUsage(TaskId task_id) const {
 | 
|    return GetTaskGroupByTaskId(task_id)->cpu_usage();
 | 
|  }
 | 
|  
 | 
| -int64 TaskManagerImpl::GetPhysicalMemoryUsage(TaskId task_id) const {
 | 
| +int64_t TaskManagerImpl::GetPhysicalMemoryUsage(TaskId task_id) const {
 | 
|    return GetTaskGroupByTaskId(task_id)->physical_bytes();
 | 
|  }
 | 
|  
 | 
| -int64 TaskManagerImpl::GetPrivateMemoryUsage(TaskId task_id) const {
 | 
| +int64_t TaskManagerImpl::GetPrivateMemoryUsage(TaskId task_id) const {
 | 
|    return GetTaskGroupByTaskId(task_id)->private_bytes();
 | 
|  }
 | 
|  
 | 
| -int64 TaskManagerImpl::GetSharedMemoryUsage(TaskId task_id) const {
 | 
| +int64_t TaskManagerImpl::GetSharedMemoryUsage(TaskId task_id) const {
 | 
|    return GetTaskGroupByTaskId(task_id)->shared_bytes();
 | 
|  }
 | 
|  
 | 
| -int64 TaskManagerImpl::GetGpuMemoryUsage(TaskId task_id,
 | 
| -                                         bool* has_duplicates) const {
 | 
| +int64_t TaskManagerImpl::GetGpuMemoryUsage(TaskId task_id,
 | 
| +                                           bool* has_duplicates) const {
 | 
|    const TaskGroup* task_group = GetTaskGroupByTaskId(task_id);
 | 
|    if (has_duplicates)
 | 
|      *has_duplicates = task_group->gpu_memory_has_duplicates();
 | 
| @@ -108,8 +109,8 @@ int TaskManagerImpl::GetNaClDebugStubPort(TaskId task_id) const {
 | 
|  }
 | 
|  
 | 
|  void TaskManagerImpl::GetGDIHandles(TaskId task_id,
 | 
| -                                    int64* current,
 | 
| -                                    int64* peak) const {
 | 
| +                                    int64_t* current,
 | 
| +                                    int64_t* peak) const {
 | 
|  #if defined(OS_WIN)
 | 
|    const TaskGroup* task_group = GetTaskGroupByTaskId(task_id);
 | 
|    *current = task_group->gdi_current_handles();
 | 
| @@ -121,8 +122,8 @@ void TaskManagerImpl::GetGDIHandles(TaskId task_id,
 | 
|  }
 | 
|  
 | 
|  void TaskManagerImpl::GetUSERHandles(TaskId task_id,
 | 
| -                                     int64* current,
 | 
| -                                     int64* peak) const {
 | 
| +                                     int64_t* current,
 | 
| +                                     int64_t* peak) const {
 | 
|  #if defined(OS_WIN)
 | 
|    const TaskGroup* task_group = GetTaskGroupByTaskId(task_id);
 | 
|    *current = task_group->user_current_handles();
 | 
| @@ -174,21 +175,21 @@ Task::Type TaskManagerImpl::GetType(TaskId task_id) const {
 | 
|    return GetTaskByTaskId(task_id)->GetType();
 | 
|  }
 | 
|  
 | 
| -int64 TaskManagerImpl::GetNetworkUsage(TaskId task_id) const {
 | 
| +int64_t TaskManagerImpl::GetNetworkUsage(TaskId task_id) const {
 | 
|    return GetTaskByTaskId(task_id)->network_usage();
 | 
|  }
 | 
|  
 | 
| -int64 TaskManagerImpl::GetProcessTotalNetworkUsage(TaskId task_id) const {
 | 
| +int64_t TaskManagerImpl::GetProcessTotalNetworkUsage(TaskId task_id) const {
 | 
|    return GetTaskGroupByTaskId(task_id)->per_process_network_usage();
 | 
|  }
 | 
|  
 | 
| -int64 TaskManagerImpl::GetSqliteMemoryUsed(TaskId task_id) const {
 | 
| +int64_t TaskManagerImpl::GetSqliteMemoryUsed(TaskId task_id) const {
 | 
|    return GetTaskByTaskId(task_id)->GetSqliteMemoryUsed();
 | 
|  }
 | 
|  
 | 
|  bool TaskManagerImpl::GetV8Memory(TaskId task_id,
 | 
| -                                  int64* allocated,
 | 
| -                                  int64* used) const {
 | 
| +                                  int64_t* allocated,
 | 
| +                                  int64_t* used) const {
 | 
|    const Task* task = GetTaskByTaskId(task_id);
 | 
|    if (!task->ReportsV8Memory())
 | 
|      return false;
 | 
| 
 |