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

test/cctest/cctest.h

Index: test/cctest/cctest.h
diff --git a/test/cctest/cctest.h b/test/cctest/cctest.h
index 2f33d13394734a3075eefaab9db72a20f653aba0..81a0dd9a4ee6fab84c598639b69d18dd7b8c4bc9 100644
--- a/test/cctest/cctest.h
+++ b/test/cctest/cctest.h
@@ -440,7 +440,7 @@ static inline void ExpectString(const char* code, const char* expected) {
   v8::Local<v8::Value> result = CompileRun(code);
   CHECK(result->IsString());
   v8::String::Utf8Value utf8(result);
-  CHECK_EQ(0, strcmp(expected, *utf8));
+  CHECK_EQ(expected, *utf8);
 }
 
 
@@ -557,7 +557,7 @@ class HeapObjectsTracker {
  public:
   HeapObjectsTracker() {
     heap_profiler_ = i::Isolate::Current()->heap_profiler();
-    CHECK_NOT_NULL(heap_profiler_);
+    CHECK_NE(NULL, heap_profiler_);
     heap_profiler_->StartHeapObjectsTracking(true);
   }