cleanup cctest generally and remove ctest::context

test/cctest/cctest.h

 // Copyright 2008 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 74 matching lines @@
   CcTest(TestFunction* callback, const char* file, const char* name,
          const char* dependency, bool enabled, bool initialize);
   void Run();
   static CcTest* last() { return last_; }
   CcTest* prev() { return prev_; }
   const char* file() { return file_; }
   const char* name() { return name_; }
   const char* dependency() { return dependency_; }
   bool enabled() { return enabled_; }
 
-  static v8::Handle<v8::Context> env() {
-    return v8::Local<v8::Context>::New(isolate(), context_);
-  }
-
   static v8::Isolate* isolate() {
-    return default_isolate_;
+    isolate_used_ = true;
+    return isolate_;
   }
 
   static i::Isolate* i_isolate() {
     return reinterpret_cast<i::Isolate*>(isolate());
   }
 
   static i::Heap* heap() {
     return i_isolate()->heap();
   }
 
-  // Helper function to initialize the VM.
-  static void InitializeVM(CcTestExtensionFlags extensions = NO_EXTENSIONS);
+  // TODO(dcarney): Remove.
+  // This must be called first in a test.
+  static void InitializeVM() {
+    CHECK(!isolate_used_);
+    CHECK(!initialize_called_);
+    initialize_called_ = true;
+    v8::HandleScope handle_scope(CcTest::isolate());
+    v8::Context::New(CcTest::isolate())->Enter();
+  }
+
+  // Helper function to configure a context.
+  // Must be in a HandleScope.
+  static v8::Local<v8::Context> NewContext(
+      CcTestExtensionFlags extensions,
+      v8::Isolate* isolate = CcTest::isolate());
 
  private:
   friend int main(int argc, char** argv);
   TestFunction* callback_;
   const char* file_;
   const char* name_;
   const char* dependency_;
   bool enabled_;
   bool initialize_;
   CcTest* prev_;
   static CcTest* last_;
-  static v8::Isolate* default_isolate_;
-  enum InitializationState {kUnset, kUnintialized, kInitialized};
-  static InitializationState initialization_state_;
-  static v8::Persistent<v8::Context> context_;
+  static v8::Isolate* isolate_;
+  static bool initialize_called_;
+  static bool isolate_used_;
 };
 
 // Switches between all the Api tests using the threading support.
 // In order to get a surprising but repeatable pattern of thread
 // switching it has extra semaphores to control the order in which
 // the tests alternate, not relying solely on the big V8 lock.
 //
 // A test is augmented with calls to ApiTestFuzzer::Fuzz() in its
 // callbacks.  This will have no effect when we are not running the
 // thread fuzzing test.  In the thread fuzzing test it will
@@ skipping 187 matching lines @@
 static inline void SimulateFullSpace(v8::internal::PagedSpace* space) {
   int old_linear_size = static_cast<int>(space->limit() - space->top());
   space->Free(space->top(), old_linear_size);
   space->SetTop(space->limit(), space->limit());
   space->ResetFreeList();
   space->ClearStats();
 }
 
 
 #endif  // ifndef CCTEST_H_