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

test/cctest/test-deoptimization.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 377 matching lines @@
           "deopt = true;"
           "var result = f('a+', new X());");
     }
     NonIncrementalGC(i_isolate);
 
     CHECK(!GetJSFunction(env->Global(), "f")->IsOptimized());
     CHECK_EQ(1, env->Global()->Get(v8_str("count"))->Int32Value());
     v8::Handle<v8::Value> result = env->Global()->Get(v8_str("result"));
     CHECK(result->IsString());
     v8::String::Utf8Value utf8(result);
-    CHECK_EQ(0, strcmp("a+an X", *utf8));
+    CHECK_EQ("a+an X", *utf8);
     CHECK_EQ(0, Deoptimizer::GetDeoptimizedCodeCount(i_isolate));
   }
   isolate->Exit();
   isolate->Dispose();
 }
 
 
 static void CompileConstructorWithDeoptimizingValueOf() {
   CompileRun("var count = 0;"
              "var result = 0;"
@@ skipping 373 matching lines @@
     CHECK(!GetJSFunction(env->Global(), "f1")->IsOptimized());
     CHECK(!GetJSFunction(env->Global(), "g1")->IsOptimized());
     CHECK(!GetJSFunction(env->Global(), "f2")->IsOptimized());
     CHECK(!GetJSFunction(env->Global(), "g2")->IsOptimized());
     CHECK_EQ(1, env->Global()->Get(v8_str("count"))->Int32Value());
     CHECK_EQ(13, env->Global()->Get(v8_str("result"))->Int32Value());
   }
   isolate->Exit();
   isolate->Dispose();
 }