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

Side by Side Diff: mojo/system/core_test_base.cc

Issue 597413002: Mojo: NULL -> nullptr in mojo/system and mojo/embedder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: EXPECT_TRUE 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 | « mojo/system/core.cc ('k') | mojo/system/core_unittest.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "mojo/system/core_test_base.h" 5 #include "mojo/system/core_test_base.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 CoreTestBase::~CoreTestBase() { 174 CoreTestBase::~CoreTestBase() {
175 } 175 }
176 176
177 void CoreTestBase::SetUp() { 177 void CoreTestBase::SetUp() {
178 core_ = new Core(scoped_ptr<embedder::PlatformSupport>( 178 core_ = new Core(scoped_ptr<embedder::PlatformSupport>(
179 new embedder::SimplePlatformSupport())); 179 new embedder::SimplePlatformSupport()));
180 } 180 }
181 181
182 void CoreTestBase::TearDown() { 182 void CoreTestBase::TearDown() {
183 delete core_; 183 delete core_;
184 core_ = NULL; 184 core_ = nullptr;
185 } 185 }
186 186
187 MojoHandle CoreTestBase::CreateMockHandle(CoreTestBase::MockHandleInfo* info) { 187 MojoHandle CoreTestBase::CreateMockHandle(CoreTestBase::MockHandleInfo* info) {
188 CHECK(core_); 188 CHECK(core_);
189 scoped_refptr<MockDispatcher> dispatcher(new MockDispatcher(info)); 189 scoped_refptr<MockDispatcher> dispatcher(new MockDispatcher(info));
190 return core_->AddDispatcher(dispatcher); 190 return core_->AddDispatcher(dispatcher);
191 } 191 }
192 192
193 // CoreTestBase_MockHandleInfo ------------------------------------------------- 193 // CoreTestBase_MockHandleInfo -------------------------------------------------
194 194
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 } 348 }
349 349
350 void CoreTestBase_MockHandleInfo::IncrementCancelAllWaitersCallCount() { 350 void CoreTestBase_MockHandleInfo::IncrementCancelAllWaitersCallCount() {
351 base::AutoLock locker(lock_); 351 base::AutoLock locker(lock_);
352 cancel_all_waiters_call_count_++; 352 cancel_all_waiters_call_count_++;
353 } 353 }
354 354
355 } // namespace test 355 } // namespace test
356 } // namespace system 356 } // namespace system
357 } // namespace mojo 357 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/system/core.cc ('k') | mojo/system/core_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698