Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(432)

Side by Side Diff: athena/resource_manager/memory_pressure_notifier_unittest.cc

Issue 653563004: NULL -> nullptr under athena/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « athena/main/athena_views_delegate.cc ('k') | athena/resource_manager/resource_manager_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /// Copyright 2014 The Chromium Authors. All rights reserved. 1 /// Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "athena/resource_manager/memory_pressure_notifier.h" 5 #include "athena/resource_manager/memory_pressure_notifier.h"
6 #include "athena/resource_manager/public/resource_manager_delegate.h" 6 #include "athena/resource_manager/public/resource_manager_delegate.h"
7 #include "athena/test/base/athena_test_base.h" 7 #include "athena/test/base/athena_test_base.h"
8 8
9 namespace athena { 9 namespace athena {
10 namespace test { 10 namespace test {
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 ResourceManager::MemoryPressure pressure_; 76 ResourceManager::MemoryPressure pressure_;
77 77
78 DISALLOW_COPY_AND_ASSIGN(TestMemoryPressureObserver); 78 DISALLOW_COPY_AND_ASSIGN(TestMemoryPressureObserver);
79 }; 79 };
80 80
81 } // namespace 81 } // namespace
82 82
83 // Our testing base. 83 // Our testing base.
84 class MemoryPressureTest : public AthenaTestBase { 84 class MemoryPressureTest : public AthenaTestBase {
85 public: 85 public:
86 MemoryPressureTest() : test_resource_manager_delegate_(NULL) {} 86 MemoryPressureTest() : test_resource_manager_delegate_(nullptr) {}
87 virtual ~MemoryPressureTest() {} 87 virtual ~MemoryPressureTest() {}
88 88
89 // AthenaTestBase: 89 // AthenaTestBase:
90 virtual void SetUp() override { 90 virtual void SetUp() override {
91 AthenaTestBase::SetUp(); 91 AthenaTestBase::SetUp();
92 // Create and install our TestAppContentDelegate with instrumentation. 92 // Create and install our TestAppContentDelegate with instrumentation.
93 test_resource_manager_delegate_ = 93 test_resource_manager_delegate_ =
94 new TestResourceManagerDelegate(); 94 new TestResourceManagerDelegate();
95 test_memory_pressure_observer_.reset(new TestMemoryPressureObserver( 95 test_memory_pressure_observer_.reset(new TestMemoryPressureObserver(
96 test_resource_manager_delegate_)); 96 test_resource_manager_delegate_));
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 213
214 // Even if the value does not change, we should not get any more calls. 214 // Even if the value does not change, we should not get any more calls.
215 ASSERT_TRUE(WaitForTimer()); 215 ASSERT_TRUE(WaitForTimer());
216 EXPECT_EQ(calls3, test_memory_pressure_observer()->number_of_calls()); 216 EXPECT_EQ(calls3, test_memory_pressure_observer()->number_of_calls());
217 EXPECT_EQ(ResourceManager::MEMORY_PRESSURE_LOW, 217 EXPECT_EQ(ResourceManager::MEMORY_PRESSURE_LOW,
218 test_memory_pressure_observer()->pressure()); 218 test_memory_pressure_observer()->pressure());
219 } 219 }
220 220
221 } // namespace test 221 } // namespace test
222 } // namespace athena 222 } // namespace athena
OLDNEW
« no previous file with comments | « athena/main/athena_views_delegate.cc ('k') | athena/resource_manager/resource_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698