| Index: chrome/browser/task_management/test_task_manager.h
|
| diff --git a/chrome/browser/task_management/test_task_manager.h b/chrome/browser/task_management/test_task_manager.h
|
| index 36f28470ac9a533b93c02d12aa3d89e47a6d3fa5..156df2e2fb6ab16820d05a31366a9a4531d5d825 100644
|
| --- a/chrome/browser/task_management/test_task_manager.h
|
| +++ b/chrome/browser/task_management/test_task_manager.h
|
| @@ -5,6 +5,9 @@
|
| #ifndef CHROME_BROWSER_TASK_MANAGEMENT_TEST_TASK_MANAGER_H_
|
| #define CHROME_BROWSER_TASK_MANAGEMENT_TEST_TASK_MANAGER_H_
|
|
|
| +#include <stddef.h>
|
| +#include <stdint.h>
|
| +
|
| #include "base/macros.h"
|
| #include "base/timer/mock_timer.h"
|
| #include "chrome/browser/task_management/task_manager_interface.h"
|
| @@ -21,18 +24,19 @@ class TestTaskManager : public TaskManagerInterface {
|
| // task_management::TaskManagerInterface:
|
| void ActivateTask(TaskId task_id) override;
|
| double GetCpuUsage(TaskId task_id) const override;
|
| - int64 GetPhysicalMemoryUsage(TaskId task_id) const override;
|
| - int64 GetPrivateMemoryUsage(TaskId task_id) const override;
|
| - int64 GetSharedMemoryUsage(TaskId task_id) const override;
|
| - int64 GetGpuMemoryUsage(TaskId task_id, bool* has_duplicates) const override;
|
| + int64_t GetPhysicalMemoryUsage(TaskId task_id) const override;
|
| + int64_t GetPrivateMemoryUsage(TaskId task_id) const override;
|
| + int64_t GetSharedMemoryUsage(TaskId task_id) const override;
|
| + int64_t GetGpuMemoryUsage(TaskId task_id,
|
| + bool* has_duplicates) const override;
|
| int GetIdleWakeupsPerSecond(TaskId task_id) const override;
|
| int GetNaClDebugStubPort(TaskId task_id) const override;
|
| void GetGDIHandles(TaskId task_id,
|
| - int64* current,
|
| - int64* peak) const override;
|
| + int64_t* current,
|
| + int64_t* peak) const override;
|
| void GetUSERHandles(TaskId task_id,
|
| - int64* current,
|
| - int64* peak) const override;
|
| + int64_t* current,
|
| + int64_t* peak) const override;
|
| int GetOpenFdCount(TaskId task_id) const override;
|
| bool IsTaskOnBackgroundedProcess(TaskId task_id) const override;
|
| const base::string16& GetTitle(TaskId task_id) const override;
|
| @@ -42,12 +46,12 @@ class TestTaskManager : public TaskManagerInterface {
|
| const base::ProcessHandle& GetProcessHandle(TaskId task_id) const override;
|
| const base::ProcessId& GetProcessId(TaskId task_id) const override;
|
| Task::Type GetType(TaskId task_id) const override;
|
| - int64 GetNetworkUsage(TaskId task_id) const override;
|
| - int64 GetProcessTotalNetworkUsage(TaskId task_id) const override;
|
| - int64 GetSqliteMemoryUsed(TaskId task_id) const override;
|
| + int64_t GetNetworkUsage(TaskId task_id) const override;
|
| + int64_t GetProcessTotalNetworkUsage(TaskId task_id) const override;
|
| + int64_t GetSqliteMemoryUsed(TaskId task_id) const override;
|
| bool GetV8Memory(TaskId task_id,
|
| - int64* allocated,
|
| - int64* used) const override;
|
| + int64_t* allocated,
|
| + int64_t* used) const override;
|
| bool GetWebCacheStats(
|
| TaskId task_id,
|
| blink::WebCache::ResourceTypeStats* stats) const override;
|
| @@ -55,7 +59,7 @@ class TestTaskManager : public TaskManagerInterface {
|
| size_t GetNumberOfTasksOnSameProcess(TaskId task_id) const override;
|
|
|
| base::TimeDelta GetRefreshTime();
|
| - int64 GetEnabledFlags();
|
| + int64_t GetEnabledFlags();
|
|
|
| protected:
|
| // task_management::TaskManager:
|
|
|