Replace EXPECT_EQ(NULL, foo) with EXPECT_TRUE(NULL == foo)....

base/weak_ptr_unittest.cc

 // Copyright (c) 2009 The Chromium 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 "testing/gtest/include/gtest/gtest.h"
 #include "base/thread.h"
 #include "base/weak_ptr.h"
 
 namespace base {
 namespace {
@@ skipping 36 matching lines @@
 TEST(WeakPtrTest, Comparison) {
   int data;
   WeakPtrFactory<int> factory(&data);
   WeakPtr<int> ptr = factory.GetWeakPtr();
   WeakPtr<int> ptr2 = ptr;
   EXPECT_TRUE(ptr == ptr2);
 }
 
 TEST(WeakPtrTest, OutOfScope) {
   WeakPtr<int> ptr;
-  EXPECT_EQ(NULL, ptr.get());
+  EXPECT_TRUE(ptr.get() == NULL);
   {
     int data;
     WeakPtrFactory<int> factory(&data);
     ptr = factory.GetWeakPtr();
   }
-  EXPECT_EQ(NULL, ptr.get());
+  EXPECT_TRUE(ptr.get() == NULL);
 }
 
 TEST(WeakPtrTest, Multiple) {
   WeakPtr<int> a, b;
   {
     int data;
     WeakPtrFactory<int> factory(&data);
     a = factory.GetWeakPtr();
     b = factory.GetWeakPtr();
     EXPECT_EQ(&data, a.get());
     EXPECT_EQ(&data, b.get());
   }
-  EXPECT_EQ(NULL, a.get());
-  EXPECT_EQ(NULL, b.get());
+  EXPECT_TRUE(a.get() == NULL);
+  EXPECT_TRUE(b.get() == NULL);
 }
 
 TEST(WeakPtrTest, UpCast) {
   Derived data;
   WeakPtrFactory<Derived> factory(&data);
   WeakPtr<Base> ptr = factory.GetWeakPtr();
   ptr = factory.GetWeakPtr();
   EXPECT_EQ(ptr.get(), &data);
 }
 
 TEST(WeakPtrTest, SupportsWeakPtr) {
   Producer f;
   WeakPtr<Producer> ptr = f.AsWeakPtr();
   EXPECT_EQ(&f, ptr.get());
 }
 
 TEST(WeakPtrTest, InvalidateWeakPtrs) {
   int data;
   WeakPtrFactory<int> factory(&data);
   WeakPtr<int> ptr = factory.GetWeakPtr();
   EXPECT_EQ(&data, ptr.get());
   EXPECT_TRUE(factory.HasWeakPtrs());
   factory.InvalidateWeakPtrs();
-  EXPECT_EQ(NULL, ptr.get());
+  EXPECT_TRUE(ptr.get() == NULL);
   EXPECT_FALSE(factory.HasWeakPtrs());
 }
 
 TEST(WeakPtrTest, HasWeakPtrs) {
   int data;
   WeakPtrFactory<int> factory(&data);
   {
     WeakPtr<int> ptr = factory.GetWeakPtr();
     EXPECT_TRUE(factory.HasWeakPtrs());
   }
@@ skipping 13 matching lines @@
   // Test that it is OK to create a class that has a WeakPtr member on one
   // thread, but use it on another.  This tests that we do not trip runtime
   // checks that ensure that a weak reference is not used by multiple threads.
   scoped_ptr<Consumer> consumer(OffThreadObjectCreator<Consumer>::NewObject());
   Producer producer;
   consumer->producer = producer.AsWeakPtr();
   EXPECT_EQ(&producer, consumer->producer.get());
 }
 
 }  // namespace base