| Index: chrome/browser/task_management/task_manager_observer_unittest.cc
|
| diff --git a/chrome/browser/task_management/task_manager_observer_unittest.cc b/chrome/browser/task_management/task_manager_observer_unittest.cc
|
| index aedd2a026cdf992fcad2f2de57eef4411bf78791..6595fa2e0ec086b896dfcd3ae9da2af48b053e29 100644
|
| --- a/chrome/browser/task_management/task_manager_observer_unittest.cc
|
| +++ b/chrome/browser/task_management/task_manager_observer_unittest.cc
|
| @@ -2,6 +2,9 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#include <stdint.h>
|
| +
|
| +#include "base/macros.h"
|
| #include "chrome/browser/task_management/test_task_manager.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -12,9 +15,8 @@ namespace {
|
| // Defines a concrete observer that will be used for testing.
|
| class TestObserver : public TaskManagerObserver {
|
| public:
|
| - TestObserver(base::TimeDelta refresh_time, int64 resources_flags)
|
| - : TaskManagerObserver(refresh_time, resources_flags) {
|
| - }
|
| + TestObserver(base::TimeDelta refresh_time, int64_t resources_flags)
|
| + : TaskManagerObserver(refresh_time, resources_flags) {}
|
|
|
| ~TestObserver() override {}
|
|
|
| @@ -49,11 +51,11 @@ class TaskManagerObserverTest : public testing::Test {
|
| TEST_F(TaskManagerObserverTest, Basic) {
|
| base::TimeDelta refresh_time1 = base::TimeDelta::FromSeconds(2);
|
| base::TimeDelta refresh_time2 = base::TimeDelta::FromMilliseconds(999);
|
| - int64 flags1 = RefreshType::REFRESH_TYPE_CPU |
|
| - RefreshType::REFRESH_TYPE_WEBCACHE_STATS |
|
| - RefreshType::REFRESH_TYPE_HANDLES;
|
| - int64 flags2 = RefreshType::REFRESH_TYPE_MEMORY |
|
| - RefreshType::REFRESH_TYPE_NACL;
|
| + int64_t flags1 = RefreshType::REFRESH_TYPE_CPU |
|
| + RefreshType::REFRESH_TYPE_WEBCACHE_STATS |
|
| + RefreshType::REFRESH_TYPE_HANDLES;
|
| + int64_t flags2 =
|
| + RefreshType::REFRESH_TYPE_MEMORY | RefreshType::REFRESH_TYPE_NACL;
|
|
|
| TestObserver observer1(refresh_time1, flags1);
|
| TestObserver observer2(refresh_time2, flags2);
|
| @@ -75,14 +77,14 @@ TEST_F(TaskManagerObserverTest, TaskManagerResponseToObservers) {
|
| base::TimeDelta refresh_time2 = base::TimeDelta::FromSeconds(10);
|
| base::TimeDelta refresh_time3 = base::TimeDelta::FromSeconds(3);
|
| base::TimeDelta refresh_time4 = base::TimeDelta::FromSeconds(2);
|
| - int64 flags1 = RefreshType::REFRESH_TYPE_CPU |
|
| - RefreshType::REFRESH_TYPE_WEBCACHE_STATS |
|
| - RefreshType::REFRESH_TYPE_HANDLES;
|
| - int64 flags2 = RefreshType::REFRESH_TYPE_MEMORY |
|
| - RefreshType::REFRESH_TYPE_NACL;
|
| - int64 flags3 = RefreshType::REFRESH_TYPE_MEMORY |
|
| - RefreshType::REFRESH_TYPE_CPU;
|
| - int64 flags4 = RefreshType::REFRESH_TYPE_GPU_MEMORY;
|
| + int64_t flags1 = RefreshType::REFRESH_TYPE_CPU |
|
| + RefreshType::REFRESH_TYPE_WEBCACHE_STATS |
|
| + RefreshType::REFRESH_TYPE_HANDLES;
|
| + int64_t flags2 =
|
| + RefreshType::REFRESH_TYPE_MEMORY | RefreshType::REFRESH_TYPE_NACL;
|
| + int64_t flags3 =
|
| + RefreshType::REFRESH_TYPE_MEMORY | RefreshType::REFRESH_TYPE_CPU;
|
| + int64_t flags4 = RefreshType::REFRESH_TYPE_GPU_MEMORY;
|
|
|
| TestObserver observer1(refresh_time1, flags1);
|
| TestObserver observer2(refresh_time2, flags2);
|
|
|