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

src/deoptimizer.h

Index: src/deoptimizer.h
diff --git a/src/deoptimizer.h b/src/deoptimizer.h
index 47412f47526e4e6ec803322bfccab96c9bb2218a..b14c3697418a7beb27c980f74eac43811c6c5391 100644
--- a/src/deoptimizer.h
+++ b/src/deoptimizer.h
@@ -95,10 +95,11 @@ class Deoptimizer : public Malloced {
     SOFT,
     // This last bailout type is not really a bailout, but used by the
     // debugger to deoptimize stack frames to allow inspection.
-    DEBUGGER,
-    kBailoutTypesWithCodeEntry = SOFT + 1
+    DEBUGGER
   };
 
+  static const int kBailoutTypesWithCodeEntry = SOFT + 1;
+
   struct Reason {
     Reason(int r, const char* m, const char* d)
         : raw_position(r), mnemonic(m), detail(d) {}