Get rid of NULLs in core/

core/fxcrt/fx_basic_bstring_unittest.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/fxcrt/include/fx_string.h"
 #include "testing/fx_string_testhelpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(fxcrt, ByteStringOperatorSubscript) {
   // CFX_ByteString includes the NUL terminator for non-empty strings.
@@ skipping 246 matching lines @@
 
   CFX_ByteStringC another_null_string;
   EXPECT_EQ(null_string, another_null_string);
 
   CFX_ByteStringC copied_null_string(null_string);
   EXPECT_EQ(copied_null_string.raw_str(), nullptr);
   EXPECT_EQ(copied_null_string.GetLength(), 0);
   EXPECT_TRUE(copied_null_string.IsEmpty());
   EXPECT_EQ(null_string, copied_null_string);
 
-  CFX_ByteStringC empty_string("");  // Pointer to NUL, not NULL pointer.
+  CFX_ByteStringC empty_string("");  // Pointer to NUL, not nullptr pointer.

[Tom Sepez, 2016/06/02 20:09:49]

ditto for comment.

[Lei Zhang, 2016/06/07 07:33:23]

Done.

   EXPECT_NE(empty_string.raw_str(), nullptr);
   EXPECT_EQ(empty_string.GetLength(), 0);
   EXPECT_TRUE(empty_string.IsEmpty());
   EXPECT_EQ(null_string, empty_string);
 
-  CFX_ByteStringC assigned_null_string("initially not NULL");
+  CFX_ByteStringC assigned_null_string("initially not nullptr");
   assigned_null_string = null_string;
   EXPECT_EQ(assigned_null_string.raw_str(), nullptr);
   EXPECT_EQ(assigned_null_string.GetLength(), 0);
   EXPECT_TRUE(assigned_null_string.IsEmpty());
   EXPECT_EQ(null_string, assigned_null_string);
 
-  CFX_ByteStringC assigned_nullptr_string("initially not NULL");
+  CFX_ByteStringC assigned_nullptr_string("initially not nullptr");
   assigned_nullptr_string = (const FX_CHAR*)nullptr;
   EXPECT_EQ(assigned_nullptr_string.raw_str(), nullptr);
   EXPECT_EQ(assigned_nullptr_string.GetLength(), 0);
   EXPECT_TRUE(assigned_nullptr_string.IsEmpty());
   EXPECT_EQ(null_string, assigned_nullptr_string);
 
   CFX_ByteStringC non_null_string("a");
   EXPECT_NE(null_string, non_null_string);
 }
 
@@ skipping 460 matching lines @@
 TEST(fxcrt, ByteStringCFromChar) {
   CFX_ByteStringC null_string;
   CFX_ByteStringC lower_a_string("a");
 
   // Must have lvalues that outlive the corresponding ByteStringC.
   char nul = '\0';
   char lower_a = 'a';
   CFX_ByteStringC nul_string_from_char(nul);
   CFX_ByteStringC lower_a_string_from_char(lower_a);
 
-  // Pointer to nul, not NULL ptr, hence length 1 ...
+  // Pointer to nul, not nullptr ptr, hence length 1 ...

[Tom Sepez, 2016/06/02 20:09:49]

ditto

[Lei Zhang, 2016/06/07 07:33:23]

Done.

   EXPECT_EQ(1, nul_string_from_char.GetLength());
   EXPECT_NE(null_string, nul_string_from_char);
 
   EXPECT_EQ(1, lower_a_string_from_char.GetLength());
   EXPECT_EQ(lower_a_string, lower_a_string_from_char);
   EXPECT_NE(nul_string_from_char, lower_a_string_from_char);
 
   CFX_ByteStringC longer_string("ab");
   EXPECT_NE(longer_string, lower_a_string_from_char);
 }
@@ skipping 319 matching lines @@
   }
 }
 
 TEST(fxcrt, EmptyByteString) {
   CFX_ByteString empty_str;
   EXPECT_TRUE(empty_str.IsEmpty());
   EXPECT_EQ(0, empty_str.GetLength());
   const FX_CHAR* cstr = empty_str.c_str();
   EXPECT_EQ(0, FXSYS_strlen(cstr));
 }