Revert "Make GCC happy again." and "Initial switch to Chromium-style CHECK_* and DCHECK_* macros.".

src/unique.h

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_HYDROGEN_UNIQUE_H_
 #define V8_HYDROGEN_UNIQUE_H_
 
 #include <ostream>  // NOLINT(readability/streams)
 
 #include "src/base/functional.h"
@@ skipping 31 matching lines @@
       raw_address_ = NULL;
     } else {
       // This is a best-effort check to prevent comparing Unique<T>'s created
       // in different GC eras; we require heap allocation to be disallowed at
       // creation time.
       // NOTE: we currently consider maps to be non-movable, so no special
       // assurance is required for creating a Unique<Map>.
       // TODO(titzer): other immortable immovable objects are also fine.
       DCHECK(!AllowHeapAllocation::IsAllowed() || handle->IsMap());
       raw_address_ = reinterpret_cast<Address>(*handle);
-      DCHECK_NOT_NULL(raw_address_);  // Non-null should imply non-zero address.
+      DCHECK_NE(raw_address_, NULL);  // Non-null should imply non-zero address.
     }
     handle_ = handle;
   }
 
   // TODO(titzer): this is a hack to migrate to Unique<T> incrementally.
   Unique(Address raw_address, Handle<T> handle)
     : raw_address_(raw_address), handle_(handle) { }
 
   // Constructor for handling automatic up casting.
   // Eg. Unique<JSFunction> can be passed when Unique<Object> is expected.
@@ skipping 287 matching lines @@
       }
       capacity_ = new_capacity;
       array_ = new_array;
     }
   }
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_HYDROGEN_UNIQUE_H_