Remove deprecated APIs from two more tests

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
 //       with the distribution.
 //     * Neither the name of Google Inc. nor the names of its
 //       contributors may be used to endorse or promote products derived
 //       from this software without specific prior written permission.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+// TODO(jochen): Remove this after the setting is turned on globally.
+#define V8_IMMINENT_DEPRECATION_WARNINGS
+
 #include <limits.h>
 
 #include "src/v8.h"
 
 #include "src/api.h"
 #include "src/base/platform/platform.h"
 #include "src/base/smart-pointers.h"
 #include "src/compilation-cache.h"
 #include "src/execution.h"
 #include "src/isolate.h"
@@ skipping 12 matching lines @@
 using ::v8::Persistent;
 using ::v8::Script;
 using ::v8::String;
 using ::v8::Value;
 using ::v8::V8;
 
 
 // Migrating an isolate
 class KangarooThread : public v8::base::Thread {
  public:
-  KangarooThread(v8::Isolate* isolate, v8::Handle<v8::Context> context)
+  KangarooThread(v8::Isolate* isolate, v8::Local<v8::Context> context)
       : Thread(Options("KangarooThread")),
         isolate_(isolate),
         context_(isolate, context) {}
 
   void Run() {
     {
       v8::Locker locker(isolate_);
       v8::Isolate::Scope isolate_scope(isolate_);
       CHECK_EQ(reinterpret_cast<v8::internal::Isolate*>(isolate_),
                v8::internal::Isolate::Current());
       v8::HandleScope scope(isolate_);
       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()));
+      CHECK_EQ(30, static_cast<int>(v->NumberValue(context).FromJust()));
     }
     {
       v8::Locker locker(isolate_);
       v8::Isolate::Scope isolate_scope(isolate_);
       v8::HandleScope scope(isolate_);
       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()));
+      CHECK_EQ(30, static_cast<int>(v->NumberValue(context).FromJust()));
     }
     isolate_->Dispose();
   }
 
  private:
   v8::Isolate* isolate_;
   Persistent<v8::Context> context_;
 };
 
 
@@ skipping 12 matching lines @@
     CHECK_EQ(reinterpret_cast<v8::internal::Isolate*>(isolate),
              v8::internal::Isolate::Current());
     CompileRun("function getValue() { return 30; }");
     thread1.Reset(new KangarooThread(isolate, context));
   }
   thread1->Start();
   thread1->Join();
 }
 
 
-static void CalcFibAndCheck() {
+static void CalcFibAndCheck(v8::Local<v8::Context> context) {
   Local<Value> v = CompileRun("function fib(n) {"
                               "  if (n <= 2) return 1;"
                               "  return fib(n-1) + fib(n-2);"
                               "}"
                               "fib(10)");
   CHECK(v->IsNumber());
-  CHECK_EQ(55, static_cast<int>(v->NumberValue()));
+  CHECK_EQ(55, static_cast<int>(v->NumberValue(context).FromJust()));
 }
 
 class JoinableThread {
  public:
   explicit JoinableThread(const char* name)
     : name_(name),
       semaphore_(0),
       thread_(this) {
   }
 
@@ skipping 43 matching lines @@
       isolate_(isolate) {
   }
 
   virtual void Run() {
     v8::Locker locker(isolate_);
     v8::Isolate::Scope isolate_scope(isolate_);
     v8::HandleScope handle_scope(isolate_);
     LocalContext local_context(isolate_);
     CHECK_EQ(reinterpret_cast<v8::internal::Isolate*>(isolate_),
              v8::internal::Isolate::Current());
-    CalcFibAndCheck();
+    CalcFibAndCheck(local_context.local());
   }
  private:
   v8::Isolate* isolate_;
 };
 
 
 static void StartJoinAndDeleteThreads(const i::List<JoinableThread*>& threads) {
   for (int i = 0; i < threads.length(); i++) {
     threads[i]->Start();
   }
@@ skipping 31 matching lines @@
   explicit IsolateNestedLockingThread(v8::Isolate* isolate)
     : JoinableThread("IsolateNestedLocking"), isolate_(isolate) {
   }
   virtual void Run() {
     v8::Locker lock(isolate_);
     v8::Isolate::Scope isolate_scope(isolate_);
     v8::HandleScope handle_scope(isolate_);
     LocalContext local_context(isolate_);
     {
       v8::Locker another_lock(isolate_);
-      CalcFibAndCheck();
+      CalcFibAndCheck(local_context.local());
     }
     {
       v8::Locker another_lock(isolate_);
-      CalcFibAndCheck();
+      CalcFibAndCheck(local_context.local());
     }
   }
  private:
   v8::Isolate* isolate_;
 };
 
 
 // Run  many threads with nested locks
 TEST(IsolateNestedLocking) {
   i::FLAG_always_opt = false;
@@ skipping 23 matching lines @@
   }
 
   virtual void Run() {
     v8::Locker lock(isolate1_);
     v8::Isolate::Scope isolate_scope(isolate1_);
     v8::HandleScope handle_scope(isolate1_);
     LocalContext local_context(isolate1_);
 
     IsolateLockingThreadWithLocalContext threadB(isolate2_);
     threadB.Start();
-    CalcFibAndCheck();
+    CalcFibAndCheck(local_context.local());
     threadB.Join();
   }
  private:
   v8::Isolate* isolate1_;
   v8::Isolate* isolate2_;
 };
 
 
 // Run parallel threads that lock and access different isolates in parallel
 TEST(SeparateIsolatesLocksNonexclusive) {
@@ skipping 13 matching lines @@
                                                              isolate2));
   }
   StartJoinAndDeleteThreads(threads);
   isolate2->Dispose();
   isolate1->Dispose();
 }
 
 class LockIsolateAndCalculateFibSharedContextThread : public JoinableThread {
  public:
   explicit LockIsolateAndCalculateFibSharedContextThread(
-      v8::Isolate* isolate, v8::Handle<v8::Context> context)
-    : JoinableThread("LockIsolateAndCalculateFibThread"),
-      isolate_(isolate),
-      context_(isolate, context) {
-  }
+      v8::Isolate* isolate, v8::Local<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::Local<v8::Context> context =
         v8::Local<v8::Context>::New(isolate_, context_);
     v8::Context::Scope context_scope(context);
-    CalcFibAndCheck();
+    CalcFibAndCheck(context);
   }
  private:
   v8::Isolate* isolate_;
   Persistent<v8::Context> context_;
 };
 
 class LockerUnlockerThread : public JoinableThread {
  public:
   explicit LockerUnlockerThread(v8::Isolate* isolate)
     : JoinableThread("LockerUnlockerThread"),
       isolate_(isolate) {
   }
 
   virtual void Run() {
     v8::Locker lock(isolate_);
     v8::Isolate::Scope isolate_scope(isolate_);
     v8::HandleScope handle_scope(isolate_);
     v8::Local<v8::Context> context = v8::Context::New(isolate_);
     {
       v8::Context::Scope context_scope(context);
-      CalcFibAndCheck();
+      CalcFibAndCheck(context);
     }
     {
       LockIsolateAndCalculateFibSharedContextThread thread(isolate_, context);
       isolate_->Exit();
       v8::Unlocker unlocker(isolate_);
       thread.Start();
       thread.Join();
     }
     isolate_->Enter();
     {
       v8::Context::Scope context_scope(context);
-      CalcFibAndCheck();
+      CalcFibAndCheck(context);
     }
   }
 
  private:
   v8::Isolate* isolate_;
 };
 
 
 // Use unlocker inside of a Locker, multiple threads.
 TEST(LockerUnlocker) {
@@ skipping 21 matching lines @@
       isolate_(isolate) {
   }
 
   virtual void Run() {
     v8::Locker lock(isolate_);
     v8::Isolate::Scope isolate_scope(isolate_);
     v8::HandleScope handle_scope(isolate_);
     v8::Local<v8::Context> context = v8::Context::New(isolate_);
     {
       v8::Context::Scope context_scope(context);
-      CalcFibAndCheck();
+      CalcFibAndCheck(context);
     }
     {
       v8::Locker second_lock(isolate_);
       {
         LockIsolateAndCalculateFibSharedContextThread thread(isolate_, context);
         isolate_->Exit();
         v8::Unlocker unlocker(isolate_);
         thread.Start();
         thread.Join();
       }
     }
     isolate_->Enter();
     {
       v8::Context::Scope context_scope(context);
-      CalcFibAndCheck();
+      CalcFibAndCheck(context);
     }
   }
 
  private:
   v8::Isolate* isolate_;
 };
 
 
 // Use Unlocker inside two Lockers.
 TEST(LockTwiceAndUnlock) {
@@ skipping 25 matching lines @@
 
   virtual void Run() {
     v8::base::SmartPointer<LockIsolateAndCalculateFibSharedContextThread>
         thread;
     v8::Locker lock1(isolate1_);
     CHECK(v8::Locker::IsLocked(isolate1_));
     CHECK(!v8::Locker::IsLocked(isolate2_));
     {
       v8::Isolate::Scope isolate_scope(isolate1_);
       v8::HandleScope handle_scope(isolate1_);
-      v8::Handle<v8::Context> context1 = v8::Context::New(isolate1_);
+      v8::Local<v8::Context> context1 = v8::Context::New(isolate1_);
       {
         v8::Context::Scope context_scope(context1);
-        CalcFibAndCheck();
+        CalcFibAndCheck(context1);
       }
       thread.Reset(new LockIsolateAndCalculateFibSharedContextThread(
           isolate1_, context1));
     }
     v8::Locker lock2(isolate2_);
     CHECK(v8::Locker::IsLocked(isolate1_));
     CHECK(v8::Locker::IsLocked(isolate2_));
     {
       v8::Isolate::Scope isolate_scope(isolate2_);
       v8::HandleScope handle_scope(isolate2_);
-      v8::Handle<v8::Context> context2 = v8::Context::New(isolate2_);
+      v8::Local<v8::Context> context2 = v8::Context::New(isolate2_);
       {
         v8::Context::Scope context_scope(context2);
-        CalcFibAndCheck();
+        CalcFibAndCheck(context2);
       }
       v8::Unlocker unlock1(isolate1_);
       CHECK(!v8::Locker::IsLocked(isolate1_));
       CHECK(v8::Locker::IsLocked(isolate2_));
       v8::Context::Scope context_scope(context2);
       thread->Start();
-      CalcFibAndCheck();
+      CalcFibAndCheck(context2);
       thread->Join();
     }
   }
 
  private:
   v8::Isolate* isolate1_;
   v8::Isolate* isolate2_;
 };
 
 
 // Lock two isolates and unlock one of them.
 TEST(LockAndUnlockDifferentIsolates) {
   v8::Isolate::CreateParams create_params;
   create_params.array_buffer_allocator = CcTest::array_buffer_allocator();
   v8::Isolate* isolate1 = v8::Isolate::New(create_params);
   v8::Isolate* isolate2 = v8::Isolate::New(create_params);
   LockAndUnlockDifferentIsolatesThread thread(isolate1, isolate2);
   thread.Start();
   thread.Join();
   isolate2->Dispose();
   isolate1->Dispose();
 }
 
 class LockUnlockLockThread : public JoinableThread {
  public:
-  LockUnlockLockThread(v8::Isolate* isolate, v8::Handle<v8::Context> context)
-    : JoinableThread("LockUnlockLockThread"),
-      isolate_(isolate),
-      context_(isolate, context) {
-  }
+  LockUnlockLockThread(v8::Isolate* isolate, v8::Local<v8::Context> context)
+      : JoinableThread("LockUnlockLockThread"),
+        isolate_(isolate),
+        context_(isolate, context) {}
 
   virtual void Run() {
     v8::Locker lock1(isolate_);
     CHECK(v8::Locker::IsLocked(isolate_));
     CHECK(!v8::Locker::IsLocked(CcTest::isolate()));
     {
       v8::Isolate::Scope isolate_scope(isolate_);
       v8::HandleScope handle_scope(isolate_);
       v8::Local<v8::Context> context =
           v8::Local<v8::Context>::New(isolate_, context_);
       v8::Context::Scope context_scope(context);
-      CalcFibAndCheck();
+      CalcFibAndCheck(context);
     }
     {
       v8::Unlocker unlock1(isolate_);
       CHECK(!v8::Locker::IsLocked(isolate_));
       CHECK(!v8::Locker::IsLocked(CcTest::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::isolate()));
         v8::Local<v8::Context> context =
             v8::Local<v8::Context>::New(isolate_, context_);
         v8::Context::Scope context_scope(context);
-        CalcFibAndCheck();
+        CalcFibAndCheck(context);
       }
     }
   }
 
  private:
   v8::Isolate* isolate_;
   v8::Persistent<v8::Context> context_;
 };
 
 
 // Locker inside an Unlocker inside a Locker.
 TEST(LockUnlockLockMultithreaded) {
 #if V8_TARGET_ARCH_MIPS
   const int kNThreads = 50;
 #else
   const int kNThreads = 100;
 #endif
   v8::Isolate::CreateParams create_params;
   create_params.array_buffer_allocator = CcTest::array_buffer_allocator();
   v8::Isolate* isolate = v8::Isolate::New(create_params);
   i::List<JoinableThread*> threads(kNThreads);
   {
     v8::Locker locker_(isolate);
     v8::Isolate::Scope isolate_scope(isolate);
     v8::HandleScope handle_scope(isolate);
-    v8::Handle<v8::Context> context = v8::Context::New(isolate);
+    v8::Local<v8::Context> context = v8::Context::New(isolate);
     for (int i = 0; i < kNThreads; i++) {
       threads.Add(new LockUnlockLockThread(
           isolate, context));
     }
   }
   StartJoinAndDeleteThreads(threads);
   isolate->Dispose();
 }
 
 class LockUnlockLockDefaultIsolateThread : public JoinableThread {
  public:
-  explicit LockUnlockLockDefaultIsolateThread(v8::Handle<v8::Context> context)
+  explicit LockUnlockLockDefaultIsolateThread(v8::Local<v8::Context> context)
       : JoinableThread("LockUnlockLockDefaultIsolateThread"),
         context_(CcTest::isolate(), context) {}
 
   virtual void Run() {
     v8::Locker lock1(CcTest::isolate());
     {
       v8::Isolate::Scope isolate_scope(CcTest::isolate());
       v8::HandleScope handle_scope(CcTest::isolate());
       v8::Local<v8::Context> context =
           v8::Local<v8::Context>::New(CcTest::isolate(), context_);
       v8::Context::Scope context_scope(context);
-      CalcFibAndCheck();
+      CalcFibAndCheck(context);
     }
     {
       v8::Unlocker unlock1(CcTest::isolate());
       {
         v8::Locker lock2(CcTest::isolate());
         v8::Isolate::Scope isolate_scope(CcTest::isolate());
         v8::HandleScope handle_scope(CcTest::isolate());
         v8::Local<v8::Context> context =
             v8::Local<v8::Context>::New(CcTest::isolate(), context_);
         v8::Context::Scope context_scope(context);
-        CalcFibAndCheck();
+        CalcFibAndCheck(context);
       }
     }
   }
 
  private:
   v8::Persistent<v8::Context> context_;
 };
 
 
 // Locker inside an Unlocker inside a Locker for default isolate.
@@ skipping 20 matching lines @@
 
 TEST(Regress1433) {
   for (int i = 0; i < 10; i++) {
     v8::Isolate::CreateParams create_params;
     create_params.array_buffer_allocator = CcTest::array_buffer_allocator();
     v8::Isolate* isolate = v8::Isolate::New(create_params);
     {
       v8::Locker lock(isolate);
       v8::Isolate::Scope isolate_scope(isolate);
       v8::HandleScope handle_scope(isolate);
-      v8::Handle<Context> context = v8::Context::New(isolate);
+      v8::Local<Context> context = v8::Context::New(isolate);
       v8::Context::Scope context_scope(context);
-      v8::Handle<String> source = v8::String::NewFromUtf8(isolate, "1+1");
-      v8::Handle<Script> script = v8::Script::Compile(source);
-      v8::Handle<Value> result = script->Run();
+      v8::Local<String> source = v8_str("1+1");
+      v8::Local<Script> script =
+          v8::Script::Compile(context, source).ToLocalChecked();
+      v8::Local<Value> result = script->Run(context).ToLocalChecked();
       v8::String::Utf8Value utf8(result);
     }
     isolate->Dispose();
   }
 }
 
 
 static const char* kSimpleExtensionSource =
   "(function Foo() {"
   "  return 4;"
@@ skipping 56 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);
 }