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

Unified Diff: minidump/minidump_thread_writer_test.cc

Issue 656703002: Convert NULL to nullptr (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: Fix 80-column violations 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « minidump/minidump_thread_writer.cc ('k') | snapshot/cpu_context_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: minidump/minidump_thread_writer_test.cc
diff --git a/minidump/minidump_thread_writer_test.cc b/minidump/minidump_thread_writer_test.cc
index b06590dc9a7ccb5b7faf9df300caa158c47fdfec..27f290eb06f90f8650d491da3101a4d5cb24ef39 100644
--- a/minidump/minidump_thread_writer_test.cc
+++ b/minidump/minidump_thread_writer_test.cc
@@ -30,8 +30,8 @@ namespace test {
namespace {
// This returns the MINIDUMP_THREAD_LIST stream in |thread_list|. If
-// |memory_list| is non-NULL, a MINIDUMP_MEMORY_LIST stream is also expected in
-// |file_contents|, and that stream will be returned in |memory_list|.
+// |memory_list| is not nullptr, a MINIDUMP_MEMORY_LIST stream is also expected
+// in |file_contents|, and that stream will be returned in |memory_list|.
void GetThreadListStream(const std::string& file_contents,
const MINIDUMP_THREAD_LIST** thread_list,
const MINIDUMP_MEMORY_LIST** memory_list) {
@@ -85,15 +85,15 @@ TEST(MinidumpThreadWriter, EmptyThreadList) {
const MINIDUMP_THREAD_LIST* thread_list;
ASSERT_NO_FATAL_FAILURE(
- GetThreadListStream(file_writer.string(), &thread_list, NULL));
+ GetThreadListStream(file_writer.string(), &thread_list, nullptr));
EXPECT_EQ(0u, thread_list->NumberOfThreads);
}
// The MINIDUMP_THREADs |expected| and |observed| are compared against each
-// other using gtest assertions. If |stack| is non-NULL, |observed| is expected
-// to contain a populated MINIDUMP_MEMORY_DESCRIPTOR in its Stack field,
-// otherwise, its Stack field is expected to be zeroed out. The memory
+// other using gtest assertions. If |stack| is not nullptr, |observed| is
+// expected to contain a populated MINIDUMP_MEMORY_DESCRIPTOR in its Stack
+// field, otherwise, its Stack field is expected to be zeroed out. The memory
// descriptor will be placed in |stack|. |observed| must contain a populated
// ThreadContext field. The context will be recovered from |file_contents| and
// stored in |context_base|.
@@ -166,7 +166,7 @@ TEST(MinidumpThreadWriter, OneThread_x86_NoStack) {
const MINIDUMP_THREAD_LIST* thread_list;
ASSERT_NO_FATAL_FAILURE(
- GetThreadListStream(file_writer.string(), &thread_list, NULL));
+ GetThreadListStream(file_writer.string(), &thread_list, nullptr));
EXPECT_EQ(1u, thread_list->NumberOfThreads);
@@ -183,7 +183,7 @@ TEST(MinidumpThreadWriter, OneThread_x86_NoStack) {
ExpectThread(&expected,
&thread_list->Threads[0],
file_writer.string(),
- NULL,
+ nullptr,
reinterpret_cast<const void**>(&observed_context)));
ASSERT_NO_FATAL_FAILURE(ExpectMinidumpContextX86(kSeed, observed_context));
@@ -231,7 +231,7 @@ TEST(MinidumpThreadWriter, OneThread_AMD64_Stack) {
const MINIDUMP_THREAD_LIST* thread_list;
ASSERT_NO_FATAL_FAILURE(
- GetThreadListStream(file_writer.string(), &thread_list, NULL));
+ GetThreadListStream(file_writer.string(), &thread_list, nullptr));
EXPECT_EQ(1u, thread_list->NumberOfThreads);
« no previous file with comments | « minidump/minidump_thread_writer.cc ('k') | snapshot/cpu_context_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698