Revert of Additional HandleScopes to limit Handle consumption.

src/heap/heap.cc

Index: src/heap/heap.cc
diff --git a/src/heap/heap.cc b/src/heap/heap.cc
index b2a00a632471bf8e637e585e285060ce36f4dc75..6425224fc0558b5d0eda69729ad717aeef973a5f 100644
--- a/src/heap/heap.cc
+++ b/src/heap/heap.cc
@@ -648,8 +648,8 @@
   if (FLAG_print_handles) PrintHandles();
   if (FLAG_gc_verbose) Print();
   if (FLAG_code_stats) ReportCodeStatistics("After GC");
+#endif
   if (FLAG_check_handle_count) CheckHandleCount();
-#endif
   if (FLAG_deopt_every_n_garbage_collections > 0) {
     // TODO(jkummerow/ulan/jarin): This is not safe! We can't assume that
     // the topmost optimized frame can be deoptimized safely, because it
@@ -5851,9 +5851,7 @@
 class CheckHandleCountVisitor : public ObjectVisitor {
  public:
   CheckHandleCountVisitor() : handle_count_(0) {}
-  ~CheckHandleCountVisitor() {
-    CHECK(handle_count_ < HandleScope::kCheckHandleThreshold);
-  }
+  ~CheckHandleCountVisitor() { CHECK(handle_count_ < 2000); }
   void VisitPointers(Object** start, Object** end) {
     handle_count_ += end - start;
   }