Revert "Remove Failure::OutOfMemory propagation and V8::IgnoreOutOfMemoryException."

test/cctest/test-api.cc

Index: test/cctest/test-api.cc
diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc
index 0818f330bd55576c18f2cbf31156eafdca01e134..a159522ff150b56c0c3ad2be783e55bc78376a22 100644
--- a/test/cctest/test-api.cc
+++ b/test/cctest/test-api.cc
@@ -19332,6 +19332,7 @@ TEST(IsolateDifferentContexts) {
 class InitDefaultIsolateThread : public v8::internal::Thread {
  public:
   enum TestCase {
+    IgnoreOOM,
     SetResourceConstraints,
     SetFatalHandler,
     SetCounterFunction,
@@ -19348,30 +19349,34 @@ class InitDefaultIsolateThread : public v8::internal::Thread {
     v8::Isolate* isolate = v8::Isolate::New();
     isolate->Enter();
     switch (testCase_) {
-      case SetResourceConstraints: {
-        static const int K = 1024;
-        v8::ResourceConstraints constraints;
-        constraints.set_max_young_space_size(256 * K);
-        constraints.set_max_old_space_size(4 * K * K);
-        v8::SetResourceConstraints(CcTest::isolate(), &constraints);
-        break;
-      }
+    case IgnoreOOM:
+      v8::V8::IgnoreOutOfMemoryException();
+      break;
 
-      case SetFatalHandler:
-        v8::V8::SetFatalErrorHandler(NULL);
-        break;
+    case SetResourceConstraints: {
+      static const int K = 1024;
+      v8::ResourceConstraints constraints;
+      constraints.set_max_young_space_size(256 * K);
+      constraints.set_max_old_space_size(4 * K * K);
+      v8::SetResourceConstraints(CcTest::isolate(), &constraints);
+      break;
+    }
 
-      case SetCounterFunction:
-        v8::V8::SetCounterFunction(NULL);
-        break;
+    case SetFatalHandler:
+      v8::V8::SetFatalErrorHandler(NULL);
+      break;
 
-      case SetCreateHistogramFunction:
-        v8::V8::SetCreateHistogramFunction(NULL);
-        break;
+    case SetCounterFunction:
+      v8::V8::SetCounterFunction(NULL);
+      break;
 
-      case SetAddHistogramSampleFunction:
-        v8::V8::SetAddHistogramSampleFunction(NULL);
-        break;
+    case SetCreateHistogramFunction:
+      v8::V8::SetCreateHistogramFunction(NULL);
+      break;
+
+    case SetAddHistogramSampleFunction:
+      v8::V8::SetAddHistogramSampleFunction(NULL);
+      break;
     }
     isolate->Exit();
     isolate->Dispose();
@@ -19395,26 +19400,31 @@ static void InitializeTestHelper(InitDefaultIsolateThread::TestCase testCase) {
 
 
 TEST(InitializeDefaultIsolateOnSecondaryThread1) {
-  InitializeTestHelper(InitDefaultIsolateThread::SetResourceConstraints);
+  InitializeTestHelper(InitDefaultIsolateThread::IgnoreOOM);
 }
 
 
 TEST(InitializeDefaultIsolateOnSecondaryThread2) {
-  InitializeTestHelper(InitDefaultIsolateThread::SetFatalHandler);
+  InitializeTestHelper(InitDefaultIsolateThread::SetResourceConstraints);
 }
 
 
 TEST(InitializeDefaultIsolateOnSecondaryThread3) {
-  InitializeTestHelper(InitDefaultIsolateThread::SetCounterFunction);
+  InitializeTestHelper(InitDefaultIsolateThread::SetFatalHandler);
 }
 
 
 TEST(InitializeDefaultIsolateOnSecondaryThread4) {
-  InitializeTestHelper(InitDefaultIsolateThread::SetCreateHistogramFunction);
+  InitializeTestHelper(InitDefaultIsolateThread::SetCounterFunction);
 }
 
 
 TEST(InitializeDefaultIsolateOnSecondaryThread5) {
+  InitializeTestHelper(InitDefaultIsolateThread::SetCreateHistogramFunction);
+}
+
+
+TEST(InitializeDefaultIsolateOnSecondaryThread6) {
   InitializeTestHelper(InitDefaultIsolateThread::SetAddHistogramSampleFunction);
 }