remove use of context scope with persistent argument

test/cctest/test-lockers.cc

 // Copyright 2007-2011 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 55 matching lines @@
       : Thread("KangarooThread"),
         isolate_(isolate),
         context_(isolate, context) {}
 
   void Run() {
     {
       v8::Locker locker(isolate_);
       v8::Isolate::Scope isolate_scope(isolate_);
       CHECK_EQ(isolate_, v8::internal::Isolate::Current());
       v8::HandleScope scope(isolate_);
-      v8::Context::Scope context_scope(isolate_, context_);
+      v8::Local<v8::Context> context =
+          v8::Local<v8::Context>::New(isolate_, context_);
+      v8::Context::Scope context_scope(context);
       Local<Value> v = CompileRun("getValue()");
       CHECK(v->IsNumber());
       CHECK_EQ(30, static_cast<int>(v->NumberValue()));
     }
     {
       v8::Locker locker(isolate_);
       v8::Isolate::Scope isolate_scope(isolate_);
       v8::HandleScope scope(isolate_);
-      v8::Context::Scope context_scope(isolate_, context_);
+      v8::Local<v8::Context> context =
+          v8::Local<v8::Context>::New(isolate_, context_);
+      v8::Context::Scope context_scope(context);
       Local<Value> v = CompileRun("getValue()");
       CHECK(v->IsNumber());
       CHECK_EQ(30, static_cast<int>(v->NumberValue()));
     }
     isolate_->Dispose();
   }
 
  private:
   v8::Isolate* isolate_;
   Persistent<v8::Context> context_;
@@ skipping 249 matching lines @@
       v8::Isolate* isolate, v8::Handle<v8::Context> context)
     : JoinableThread("LockIsolateAndCalculateFibThread"),
       isolate_(isolate),
       context_(isolate, context) {
   }
 
   virtual void Run() {
     v8::Locker lock(isolate_);
     v8::Isolate::Scope isolate_scope(isolate_);
     HandleScope handle_scope(isolate_);
-    v8::Context::Scope context_scope(isolate_, context_);
+    v8::Local<v8::Context> context =
+        v8::Local<v8::Context>::New(isolate_, context_);
+    v8::Context::Scope context_scope(context);
     CalcFibAndCheck();
   }
  private:
   v8::Isolate* isolate_;
   Persistent<v8::Context> context_;
 };
 
 class LockerUnlockerThread : public JoinableThread {
  public:
   explicit LockerUnlockerThread(v8::Isolate* isolate)
@@ skipping 167 matching lines @@
       context_(isolate, context) {
   }
 
   virtual void Run() {
     v8::Locker lock1(isolate_);
     CHECK(v8::Locker::IsLocked(isolate_));
     CHECK(!v8::Locker::IsLocked(CcTest::default_isolate()));
     {
       v8::Isolate::Scope isolate_scope(isolate_);
       v8::HandleScope handle_scope(isolate_);
-      v8::Context::Scope context_scope(isolate_, context_);
+      v8::Local<v8::Context> context =
+          v8::Local<v8::Context>::New(isolate_, context_);
+      v8::Context::Scope context_scope(context);
       CalcFibAndCheck();
     }
     {
       v8::Unlocker unlock1(isolate_);
       CHECK(!v8::Locker::IsLocked(isolate_));
       CHECK(!v8::Locker::IsLocked(CcTest::default_isolate()));
       {
         v8::Locker lock2(isolate_);
         v8::Isolate::Scope isolate_scope(isolate_);
         v8::HandleScope handle_scope(isolate_);
         CHECK(v8::Locker::IsLocked(isolate_));
         CHECK(!v8::Locker::IsLocked(CcTest::default_isolate()));
-        v8::Context::Scope context_scope(isolate_, context_);
+        v8::Local<v8::Context> context =
+            v8::Local<v8::Context>::New(isolate_, context_);
+        v8::Context::Scope context_scope(context);
         CalcFibAndCheck();
       }
     }
   }
 
  private:
   v8::Isolate* isolate_;
   v8::Persistent<v8::Context> context_;
 };
 
@@ skipping 23 matching lines @@
 class LockUnlockLockDefaultIsolateThread : public JoinableThread {
  public:
   explicit LockUnlockLockDefaultIsolateThread(v8::Handle<v8::Context> context)
       : JoinableThread("LockUnlockLockDefaultIsolateThread"),
         context_(CcTest::default_isolate(), context) {}
 
   virtual void Run() {
     v8::Locker lock1(CcTest::default_isolate());
     {
       v8::HandleScope handle_scope(CcTest::default_isolate());
-      v8::Context::Scope context_scope(CcTest::default_isolate(), context_);
+      v8::Local<v8::Context> context =
+          v8::Local<v8::Context>::New(CcTest::default_isolate(), context_);
+      v8::Context::Scope context_scope(context);
       CalcFibAndCheck();
     }
     {
       v8::Unlocker unlock1(CcTest::default_isolate());
       {
         v8::Locker lock2(CcTest::default_isolate());
         v8::HandleScope handle_scope(CcTest::default_isolate());
-        v8::Context::Scope context_scope(CcTest::default_isolate(), context_);
+        v8::Local<v8::Context> context =
+            v8::Local<v8::Context>::New(CcTest::default_isolate(), context_);
+        v8::Context::Scope context_scope(context);
         CalcFibAndCheck();
       }
     }
   }
 
  private:
   v8::Persistent<v8::Context> context_;
 };
 
 // Locker inside an Unlocker inside a Locker for default isolate.
@@ skipping 92 matching lines @@
                                           kSimpleExtensionSource));
   const char* extension_names[] = { "test0", "test1",
                                     "test2", "test3", "test4",
                                     "test5", "test6", "test7" };
   i::List<JoinableThread*> threads(kNThreads);
   for (int i = 0; i < kNThreads; i++) {
     threads.Add(new IsolateGenesisThread(8, extension_names));
   }
   StartJoinAndDeleteThreads(threads);
 }