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

test/cctest/test-sampler-api.cc

 // Copyright 2014 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.
 //
 // Tests the sampling API in include/v8.h
 
 #include <map>
 #include <string>
 #include "include/v8.h"
 #include "src/simulator.h"
@@ skipping 67 matching lines @@
  public:
   struct CodeEventEntry {
     std::string name;
     const void* code_start;
     size_t code_len;
   };
   typedef std::map<const void*, CodeEventEntry> CodeEntries;
 
   explicit SamplingTestHelper(const std::string& test_function)
       : sample_is_taken_(false), isolate_(CcTest::isolate()) {
-    DCHECK(!instance_);
+    DCHECK_EQ(NULL, instance_);
     instance_ = this;
     v8::HandleScope scope(isolate_);
     v8::Handle<v8::ObjectTemplate> global = v8::ObjectTemplate::New(isolate_);
     global->Set(v8::String::NewFromUtf8(isolate_, "CollectSample"),
                 v8::FunctionTemplate::New(isolate_, CollectSample));
     LocalContext env(isolate_, NULL, global);
     isolate_->SetJitCodeEventHandler(v8::kJitCodeEventDefault,
                                      JitCodeEventHandler);
     v8::Script::Compile(
         v8::String::NewFromUtf8(isolate_, test_function.c_str()))->Run();
@@ skipping 130 matching lines @@
       "  return test_sampler_api_inner() + arguments.callee.toString();"
       "}"
       "test_sampler_api_outer();";
 
   SamplingTestHelper helper(test_script);
   Sample& sample = helper.sample();
   CHECK_EQ(3, sample.size());
 
   const SamplingTestHelper::CodeEventEntry* entry;
   entry = helper.FindEventEntry(sample.begin()[0]);
-  CHECK(entry);
+  CHECK_NE(NULL, entry);
   CHECK(std::string::npos != entry->name.find("test_sampler_api_inner"));
 
   entry = helper.FindEventEntry(sample.begin()[1]);
-  CHECK(entry);
+  CHECK_NE(NULL, entry);
   CHECK(std::string::npos != entry->name.find("test_sampler_api_outer"));
 }