diff options
| author | reveman <reveman@chromium.org> | 2014-10-16 15:20:17 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-16 22:20:40 +0000 |
| commit | d8ee1714ece7a563f981813381610fd37c37444e (patch) | |
| tree | 9926dee8bca51cf5af47c679be7c92a228c9d1df /base/memory | |
| parent | e145db7c790c3a6f8214e46d816f46c29d1c4a5d (diff) | |
| download | chromium_src-d8ee1714ece7a563f981813381610fd37c37444e.zip chromium_src-d8ee1714ece7a563f981813381610fd37c37444e.tar.gz chromium_src-d8ee1714ece7a563f981813381610fd37c37444e.tar.bz2 | |
base: Use nullptr instead of NULL and static_cast in discardable memory unit tests.
BUG=422953
TEST=base_unittests --gtest_filter=DiscardableMemoryTests*
TBR=danakj@chromium.org
Review URL: https://codereview.chromium.org/659143002
Cr-Commit-Position: refs/heads/master@{#299991}
Diffstat (limited to 'base/memory')
| -rw-r--r-- | base/memory/discardable_memory_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/memory/discardable_memory_unittest.cc b/base/memory/discardable_memory_unittest.cc index a111cfc..2bdc079 100644 --- a/base/memory/discardable_memory_unittest.cc +++ b/base/memory/discardable_memory_unittest.cc @@ -65,13 +65,13 @@ TEST_P(DiscardableMemoryTest, LockAndUnLock) { const scoped_ptr<DiscardableMemory> memory(CreateLockedMemory(kSize)); ASSERT_TRUE(memory); void* addr = memory->Memory(); - ASSERT_NE(static_cast<void*>(NULL), addr); + ASSERT_NE(nullptr, addr); memory->Unlock(); EXPECT_NE(DISCARDABLE_MEMORY_LOCK_STATUS_FAILED, memory->Lock()); addr = memory->Memory(); - ASSERT_NE(static_cast<void*>(NULL), addr); + ASSERT_NE(nullptr, addr); memory->Unlock(); } |