Continuing removing deprecated function from cctest

test/cctest/test-object-observe.cc

 // Copyright 2012 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(mythria): Remove this define after this flag is turned on globally
+#define V8_IMMINENT_DEPRECATION_WARNINGS
+
 #include "src/v8.h"
 
 #include "test/cctest/cctest.h"
 
 using namespace v8;
 namespace i = v8::internal;
 
+inline int32_t ToInt32_t(v8::Local<v8::Value> value) {

[rmcilroy, 2015/10/06 10:53:57]

nit - just ToInt32 (drop the "_t")

[mythria, 2015/10/06 11:12:23]

Done.

+  return value->Int32Value(v8::Isolate::GetCurrent()->GetCurrentContext())
+      .FromJust();
+}
+
 
 TEST(PerIsolateState) {
   HandleScope scope(CcTest::isolate());
   LocalContext context1(CcTest::isolate());
 
   Local<Value> foo = v8_str("foo");
   context1->SetSecurityToken(foo);
 
   CompileRun(
       "var count = 0;"
       "var calls = 0;"
       "var observer = function(records) { count = records.length; calls++ };"
       "var obj = {};"
       "Object.observe(obj, observer);");
-  Handle<Value> observer = CompileRun("observer");
-  Handle<Value> obj = CompileRun("obj");
-  Handle<Value> notify_fun1 = CompileRun(
-      "(function() { obj.foo = 'bar'; })");
-  Handle<Value> notify_fun2;
+  Local<Value> observer = CompileRun("observer");
+  Local<Value> obj = CompileRun("obj");
+  Local<Value> notify_fun1 = CompileRun("(function() { obj.foo = 'bar'; })");
+  Local<Value> notify_fun2;
   {
     LocalContext context2(CcTest::isolate());
     context2->SetSecurityToken(foo);
-    context2->Global()->Set(String::NewFromUtf8(CcTest::isolate(), "obj"),
-                            obj);
+    context2->Global()
+        ->Set(v8::Isolate::GetCurrent()->GetCurrentContext(), v8_str("obj"),
+              obj)
+        .FromJust();
     notify_fun2 = CompileRun(
         "(function() { obj.foo = 'baz'; })");
   }
-  Handle<Value> notify_fun3;
+  Local<Value> notify_fun3;
   {
     LocalContext context3(CcTest::isolate());
     context3->SetSecurityToken(foo);
-    context3->Global()->Set(String::NewFromUtf8(CcTest::isolate(), "obj"),
-                            obj);
-    notify_fun3 = CompileRun(
-        "(function() { obj.foo = 'bat'; })");
+    context3->Global()
+        ->Set(v8::Isolate::GetCurrent()->GetCurrentContext(), v8_str("obj"),
+              obj)
+        .FromJust();
+    notify_fun3 = CompileRun("(function() { obj.foo = 'bat'; })");
   }
   {
     LocalContext context4(CcTest::isolate());
     context4->SetSecurityToken(foo);
-    context4->Global()->Set(
-        String::NewFromUtf8(CcTest::isolate(), "observer"), observer);
-    context4->Global()->Set(String::NewFromUtf8(CcTest::isolate(), "fun1"),
-                            notify_fun1);
-    context4->Global()->Set(String::NewFromUtf8(CcTest::isolate(), "fun2"),
-                            notify_fun2);
-    context4->Global()->Set(String::NewFromUtf8(CcTest::isolate(), "fun3"),
-                            notify_fun3);
+    context4->Global()
+        ->Set(v8::Isolate::GetCurrent()->GetCurrentContext(),
+              v8_str("observer"), observer)
+        .FromJust();
+    context4->Global()
+        ->Set(v8::Isolate::GetCurrent()->GetCurrentContext(), v8_str("fun1"),
+              notify_fun1)
+        .FromJust();
+    context4->Global()
+        ->Set(v8::Isolate::GetCurrent()->GetCurrentContext(), v8_str("fun2"),
+              notify_fun2)
+        .FromJust();
+    context4->Global()
+        ->Set(v8::Isolate::GetCurrent()->GetCurrentContext(), v8_str("fun3"),
+              notify_fun3)
+        .FromJust();
     CompileRun("fun1(); fun2(); fun3(); Object.deliverChangeRecords(observer)");
   }
-  CHECK_EQ(1, CompileRun("calls")->Int32Value());
-  CHECK_EQ(3, CompileRun("count")->Int32Value());
+  CHECK_EQ(1, ToInt32_t(CompileRun("calls")));
+  CHECK_EQ(3, ToInt32_t(CompileRun("count")));
 }
 
 
 TEST(EndOfMicrotaskDelivery) {
   HandleScope scope(CcTest::isolate());
   LocalContext context(CcTest::isolate());
   CompileRun(
       "var obj = {};"
       "var count = 0;"
       "var observer = function(records) { count = records.length };"
       "Object.observe(obj, observer);"
       "obj.foo = 'bar';");
-  CHECK_EQ(1, CompileRun("count")->Int32Value());
+  CHECK_EQ(1, ToInt32_t(CompileRun("count")));
 }
 
 
 TEST(DeliveryOrdering) {
   HandleScope scope(CcTest::isolate());
   LocalContext context(CcTest::isolate());
   CompileRun(
       "var obj1 = {};"
       "var obj2 = {};"
       "var ordering = [];"
       "function observer2() { ordering.push(2); };"
       "function observer1() { ordering.push(1); };"
       "function observer3() { ordering.push(3); };"
       "Object.observe(obj1, observer1);"
       "Object.observe(obj1, observer2);"
       "Object.observe(obj1, observer3);"
       "obj1.foo = 'bar';");
-  CHECK_EQ(3, CompileRun("ordering.length")->Int32Value());
-  CHECK_EQ(1, CompileRun("ordering[0]")->Int32Value());
-  CHECK_EQ(2, CompileRun("ordering[1]")->Int32Value());
-  CHECK_EQ(3, CompileRun("ordering[2]")->Int32Value());
+  CHECK_EQ(3, ToInt32_t(CompileRun("ordering.length")));
+  CHECK_EQ(1, ToInt32_t(CompileRun("ordering[0]")));
+  CHECK_EQ(2, ToInt32_t(CompileRun("ordering[1]")));
+  CHECK_EQ(3, ToInt32_t(CompileRun("ordering[2]")));
   CompileRun(
       "ordering = [];"
       "Object.observe(obj2, observer3);"
       "Object.observe(obj2, observer2);"
       "Object.observe(obj2, observer1);"
       "obj2.foo = 'baz'");
-  CHECK_EQ(3, CompileRun("ordering.length")->Int32Value());
-  CHECK_EQ(1, CompileRun("ordering[0]")->Int32Value());
-  CHECK_EQ(2, CompileRun("ordering[1]")->Int32Value());
-  CHECK_EQ(3, CompileRun("ordering[2]")->Int32Value());
+  CHECK_EQ(3, ToInt32_t(CompileRun("ordering.length")));
+  CHECK_EQ(1, ToInt32_t(CompileRun("ordering[0]")));
+  CHECK_EQ(2, ToInt32_t(CompileRun("ordering[1]")));
+  CHECK_EQ(3, ToInt32_t(CompileRun("ordering[2]")));
 }
 
 
 TEST(DeliveryCallbackThrows) {
   HandleScope scope(CcTest::isolate());
   LocalContext context(CcTest::isolate());
   CompileRun(
       "var obj = {};"
       "var ordering = [];"
       "function observer1() { ordering.push(1); };"
       "function observer2() { ordering.push(2); };"
       "function observer_throws() {"
       "  ordering.push(0);"
       "  throw new Error();"
       "  ordering.push(-1);"
       "};"
       "Object.observe(obj, observer_throws.bind());"
       "Object.observe(obj, observer1);"
       "Object.observe(obj, observer_throws.bind());"
       "Object.observe(obj, observer2);"
       "Object.observe(obj, observer_throws.bind());"
       "obj.foo = 'bar';");
-  CHECK_EQ(5, CompileRun("ordering.length")->Int32Value());
-  CHECK_EQ(0, CompileRun("ordering[0]")->Int32Value());
-  CHECK_EQ(1, CompileRun("ordering[1]")->Int32Value());
-  CHECK_EQ(0, CompileRun("ordering[2]")->Int32Value());
-  CHECK_EQ(2, CompileRun("ordering[3]")->Int32Value());
-  CHECK_EQ(0, CompileRun("ordering[4]")->Int32Value());
+  CHECK_EQ(5, ToInt32_t(CompileRun("ordering.length")));
+  CHECK_EQ(0, ToInt32_t(CompileRun("ordering[0]")));
+  CHECK_EQ(1, ToInt32_t(CompileRun("ordering[1]")));
+  CHECK_EQ(0, ToInt32_t(CompileRun("ordering[2]")));
+  CHECK_EQ(2, ToInt32_t(CompileRun("ordering[3]")));
+  CHECK_EQ(0, ToInt32_t(CompileRun("ordering[4]")));
 }
 
 
 TEST(DeliveryChangesMutationInCallback) {
   HandleScope scope(CcTest::isolate());
   LocalContext context(CcTest::isolate());
   CompileRun(
       "var obj = {};"
       "var ordering = [];"
       "function observer1(records) {"
       "  ordering.push(100 + records.length);"
       "  records.push(11);"
       "  records.push(22);"
       "};"
       "function observer2(records) {"
       "  ordering.push(200 + records.length);"
       "  records.push(33);"
       "  records.push(44);"
       "};"
       "Object.observe(obj, observer1);"
       "Object.observe(obj, observer2);"
       "obj.foo = 'bar';");
-  CHECK_EQ(2, CompileRun("ordering.length")->Int32Value());
-  CHECK_EQ(101, CompileRun("ordering[0]")->Int32Value());
-  CHECK_EQ(201, CompileRun("ordering[1]")->Int32Value());
+  CHECK_EQ(2, ToInt32_t(CompileRun("ordering.length")));
+  CHECK_EQ(101, ToInt32_t(CompileRun("ordering[0]")));
+  CHECK_EQ(201, ToInt32_t(CompileRun("ordering[1]")));
 }
 
 
 TEST(DeliveryOrderingReentrant) {
   HandleScope scope(CcTest::isolate());
   LocalContext context(CcTest::isolate());
   CompileRun(
       "var obj = {};"
       "var reentered = false;"
       "var ordering = [];"
       "function observer1() { ordering.push(1); };"
       "function observer2() {"
       "  if (!reentered) {"
       "    obj.foo = 'baz';"
       "    reentered = true;"
       "  }"
       "  ordering.push(2);"
       "};"
       "function observer3() { ordering.push(3); };"
       "Object.observe(obj, observer1);"
       "Object.observe(obj, observer2);"
       "Object.observe(obj, observer3);"
       "obj.foo = 'bar';");
-  CHECK_EQ(5, CompileRun("ordering.length")->Int32Value());
-  CHECK_EQ(1, CompileRun("ordering[0]")->Int32Value());
-  CHECK_EQ(2, CompileRun("ordering[1]")->Int32Value());
-  CHECK_EQ(3, CompileRun("ordering[2]")->Int32Value());
+  CHECK_EQ(5, ToInt32_t(CompileRun("ordering.length")));
+  CHECK_EQ(1, ToInt32_t(CompileRun("ordering[0]")));
+  CHECK_EQ(2, ToInt32_t(CompileRun("ordering[1]")));
+  CHECK_EQ(3, ToInt32_t(CompileRun("ordering[2]")));
   // Note that we re-deliver to observers 1 and 2, while observer3
   // already received the second record during the first round.
-  CHECK_EQ(1, CompileRun("ordering[3]")->Int32Value());
-  CHECK_EQ(2, CompileRun("ordering[1]")->Int32Value());
+  CHECK_EQ(1, ToInt32_t(CompileRun("ordering[3]")));
+  CHECK_EQ(2, ToInt32_t(CompileRun("ordering[1]")));
 }
 
 
 TEST(DeliveryOrderingDeliverChangeRecords) {
   HandleScope scope(CcTest::isolate());
   LocalContext context(CcTest::isolate());
   CompileRun(
       "var obj = {};"
       "var ordering = [];"
       "function observer1() { ordering.push(1); if (!obj.b) obj.b = true };"
       "function observer2() { ordering.push(2); };"
       "Object.observe(obj, observer1);"
       "Object.observe(obj, observer2);"
       "obj.a = 1;"
       "Object.deliverChangeRecords(observer2);");
-  CHECK_EQ(4, CompileRun("ordering.length")->Int32Value());
+  CHECK_EQ(4, ToInt32_t(CompileRun("ordering.length")));
   // First, observer2 is called due to deliverChangeRecords
-  CHECK_EQ(2, CompileRun("ordering[0]")->Int32Value());
+  CHECK_EQ(2, ToInt32_t(CompileRun("ordering[0]")));
   // Then, observer1 is called when the stack unwinds
-  CHECK_EQ(1, CompileRun("ordering[1]")->Int32Value());
+  CHECK_EQ(1, ToInt32_t(CompileRun("ordering[1]")));
   // observer1's mutation causes both 1 and 2 to be reactivated,
   // with 1 having priority.
-  CHECK_EQ(1, CompileRun("ordering[2]")->Int32Value());
-  CHECK_EQ(2, CompileRun("ordering[3]")->Int32Value());
+  CHECK_EQ(1, ToInt32_t(CompileRun("ordering[2]")));
+  CHECK_EQ(2, ToInt32_t(CompileRun("ordering[3]")));
 }
 
 
 TEST(ObjectHashTableGrowth) {
   HandleScope scope(CcTest::isolate());
   // Initializing this context sets up initial hash tables.
   LocalContext context(CcTest::isolate());
-  Handle<Value> obj = CompileRun("obj = {};");
-  Handle<Value> observer = CompileRun(
+  Local<Value> obj = CompileRun("obj = {};");
+  Local<Value> observer = CompileRun(
       "var ran = false;"
       "(function() { ran = true })");
   {
     // As does initializing this context.
     LocalContext context2(CcTest::isolate());
-    context2->Global()->Set(String::NewFromUtf8(CcTest::isolate(), "obj"),
-                            obj);
-    context2->Global()->Set(
-        String::NewFromUtf8(CcTest::isolate(), "observer"), observer);
+    context2->Global()
+        ->Set(v8::Isolate::GetCurrent()->GetCurrentContext(), v8_str("obj"),
+              obj)
+        .FromJust();
+    context2->Global()
+        ->Set(v8::Isolate::GetCurrent()->GetCurrentContext(),
+              v8_str("observer"), observer)
+        .FromJust();
     CompileRun(
         "var objArr = [];"
         // 100 objects should be enough to make the hash table grow
         // (and thus relocate).
         "for (var i = 0; i < 100; ++i) {"
         "  objArr.push({});"
         "  Object.observe(objArr[objArr.length-1], function(){});"
         "}"
         "Object.observe(obj, observer);");
   }
   // obj is now marked "is_observed", but our map has moved.
   CompileRun("obj.foo = 'bar'");
-  CHECK(CompileRun("ran")->BooleanValue());
+  CHECK(CompileRun("ran")
+            ->BooleanValue(v8::Isolate::GetCurrent()->GetCurrentContext())
+            .FromJust());
 }
 
 
 struct RecordExpectation {
-  Handle<Value> object;
+  Local<Value> object;
   const char* type;
   const char* name;
-  Handle<Value> old_value;
+  Local<Value> old_value;
 };
 
 
 // TODO(adamk): Use this helper elsewhere in this file.
-static void ExpectRecords(v8::Isolate* isolate,
-                          Handle<Value> records,
-                          const RecordExpectation expectations[],
-                          int num) {
+static void ExpectRecords(v8::Isolate* isolate, Local<Value> records,
+                          const RecordExpectation expectations[], int num) {
   CHECK(records->IsArray());
-  Handle<Array> recordArray = records.As<Array>();
+  Local<Array> recordArray = records.As<Array>();
   CHECK_EQ(num, static_cast<int>(recordArray->Length()));
   for (int i = 0; i < num; ++i) {
-    Handle<Value> record = recordArray->Get(i);
+    Local<Value> record =
+        recordArray->Get(v8::Isolate::GetCurrent()->GetCurrentContext(), i)
+            .ToLocalChecked();
     CHECK(record->IsObject());
-    Handle<Object> recordObj = record.As<Object>();
-    CHECK(expectations[i].object->StrictEquals(
-        recordObj->Get(String::NewFromUtf8(isolate, "object"))));
-    CHECK(String::NewFromUtf8(isolate, expectations[i].type)->Equals(
-        recordObj->Get(String::NewFromUtf8(isolate, "type"))));
+    Local<Object> recordObj = record.As<Object>();
+    Local<Value> value =
+        recordObj->Get(v8::Isolate::GetCurrent()->GetCurrentContext(),
+                       v8_str("object"))
+            .ToLocalChecked();
+    CHECK(expectations[i].object->StrictEquals(value));
+    value = recordObj->Get(v8::Isolate::GetCurrent()->GetCurrentContext(),
+                           v8_str("type"))
+                .ToLocalChecked();
+    CHECK(v8_str(expectations[i].type)
+              ->Equals(v8::Isolate::GetCurrent()->GetCurrentContext(), value)
+              .FromJust());
     if (strcmp("splice", expectations[i].type) != 0) {
-      CHECK(String::NewFromUtf8(isolate, expectations[i].name)->Equals(
-          recordObj->Get(String::NewFromUtf8(isolate, "name"))));
+      Local<Value> name =
+          recordObj->Get(v8::Isolate::GetCurrent()->GetCurrentContext(),
+                         v8_str("name"))
+              .ToLocalChecked();
+      CHECK(v8_str(expectations[i].name)
+                ->Equals(v8::Isolate::GetCurrent()->GetCurrentContext(), name)
+                .FromJust());
       if (!expectations[i].old_value.IsEmpty()) {
-        CHECK(expectations[i].old_value->Equals(
-            recordObj->Get(String::NewFromUtf8(isolate, "oldValue"))));
+        Local<Value> old_value =
+            recordObj->Get(v8::Isolate::GetCurrent()->GetCurrentContext(),
+                           v8_str("oldValue"))
+                .ToLocalChecked();
+        CHECK(expectations[i]
+                  .old_value->Equals(
+                                v8::Isolate::GetCurrent()->GetCurrentContext(),
+                                old_value)
+                  .FromJust());
       }
     }
   }
 }
 
 #define EXPECT_RECORDS(records, expectations)                \
   ExpectRecords(CcTest::isolate(), records, expectations, \
                 arraysize(expectations))
 
 TEST(APITestBasicMutation) {
   v8::Isolate* v8_isolate = CcTest::isolate();
   HandleScope scope(v8_isolate);
   LocalContext context(v8_isolate);
-  Handle<Object> obj = Handle<Object>::Cast(CompileRun(
-      "var records = [];"
-      "var obj = {};"
-      "function observer(r) { [].push.apply(records, r); };"
-      "Object.observe(obj, observer);"
-      "obj"));
-  obj->Set(String::NewFromUtf8(v8_isolate, "foo"),
-           Number::New(v8_isolate, 7));
-  obj->Set(1, Number::New(v8_isolate, 2));
+  Local<Object> obj = Local<Object>::Cast(
+      CompileRun("var records = [];"
+                 "var obj = {};"
+                 "function observer(r) { [].push.apply(records, r); };"
+                 "Object.observe(obj, observer);"
+                 "obj"));
+  obj->Set(v8::Isolate::GetCurrent()->GetCurrentContext(), v8_str("foo"),
+           Number::New(v8_isolate, 7))
+      .FromJust();
+  obj->Set(v8::Isolate::GetCurrent()->GetCurrentContext(), 1,
+           Number::New(v8_isolate, 2))
+      .FromJust();
   // ForceSet should work just as well as Set

[rmcilroy, 2015/10/06 10:53:57]

Update comment

[mythria, 2015/10/06 11:12:23]

Done.

-  obj->ForceSet(String::NewFromUtf8(v8_isolate, "foo"),
-                Number::New(v8_isolate, 3));
-  obj->ForceSet(Number::New(v8_isolate, 1), Number::New(v8_isolate, 4));
+  obj->CreateDataProperty(v8::Isolate::GetCurrent()->GetCurrentContext(),
+                          v8_str("foo"), Number::New(v8_isolate, 3))
+      .FromJust();
+  obj->CreateDataProperty(v8::Isolate::GetCurrent()->GetCurrentContext(), 1,
+                          Number::New(v8_isolate, 4))
+      .FromJust();
   // Setting an indexed element via the property setting method
-  obj->Set(Number::New(v8_isolate, 1), Number::New(v8_isolate, 5));
+  obj->Set(v8::Isolate::GetCurrent()->GetCurrentContext(),
+           Number::New(v8_isolate, 1), Number::New(v8_isolate, 5))
+      .FromJust();
   // Setting with a non-String, non-uint32 key
-  obj->Set(Number::New(v8_isolate, 1.1), Number::New(v8_isolate, 6));
-  obj->Delete(String::NewFromUtf8(v8_isolate, "foo"));
-  obj->Delete(1);
-  obj->Delete(Number::New(v8_isolate, 1.1));
+  obj->Set(v8::Isolate::GetCurrent()->GetCurrentContext(),
+           Number::New(v8_isolate, 1.1), Number::New(v8_isolate, 6))
+      .FromJust();
+  obj->Delete(v8::Isolate::GetCurrent()->GetCurrentContext(), v8_str("foo"))
+      .FromJust();
+  obj->Delete(v8::Isolate::GetCurrent()->GetCurrentContext(), 1).FromJust();
+  obj->Delete(v8::Isolate::GetCurrent()->GetCurrentContext(),
+              Number::New(v8_isolate, 1.1))
+      .FromJust();
 
   // Force delivery
   // TODO(adamk): Should the above set methods trigger delivery themselves?
   CompileRun("void 0");
-  CHECK_EQ(9, CompileRun("records.length")->Int32Value());
+  CHECK_EQ(9, ToInt32_t(CompileRun("records.length")));
   const RecordExpectation expected_records[] = {
-    { obj, "add", "foo", Handle<Value>() },
-    { obj, "add", "1", Handle<Value>() },
-    // Note: use 7 not 1 below, as the latter triggers a nifty VS10 compiler bug
-    // where instead of 1.0, a garbage value would be passed into Number::New.
-    { obj, "update", "foo", Number::New(v8_isolate, 7) },
-    { obj, "update", "1", Number::New(v8_isolate, 2) },
-    { obj, "update", "1", Number::New(v8_isolate, 4) },
-    { obj, "add", "1.1", Handle<Value>() },
-    { obj, "delete", "foo", Number::New(v8_isolate, 3) },
-    { obj, "delete", "1", Number::New(v8_isolate, 5) },
-    { obj, "delete", "1.1", Number::New(v8_isolate, 6) }
-  };
+      {obj, "add", "foo", Local<Value>()},
+      {obj, "add", "1", Local<Value>()},
+      // Note: use 7 not 1 below, as the latter triggers a nifty VS10 compiler
+      // bug
+      // where instead of 1.0, a garbage value would be passed into Number::New.
+      {obj, "update", "foo", Number::New(v8_isolate, 7)},
+      {obj, "update", "1", Number::New(v8_isolate, 2)},
+      {obj, "update", "1", Number::New(v8_isolate, 4)},
+      {obj, "add", "1.1", Local<Value>()},
+      {obj, "delete", "foo", Number::New(v8_isolate, 3)},
+      {obj, "delete", "1", Number::New(v8_isolate, 5)},
+      {obj, "delete", "1.1", Number::New(v8_isolate, 6)}};
   EXPECT_RECORDS(CompileRun("records"), expected_records);
 }
 
 
 TEST(HiddenPrototypeObservation) {
   v8::Isolate* v8_isolate = CcTest::isolate();
   HandleScope scope(v8_isolate);
   LocalContext context(v8_isolate);
-  Handle<FunctionTemplate> tmpl = FunctionTemplate::New(v8_isolate);
+  Local<FunctionTemplate> tmpl = FunctionTemplate::New(v8_isolate);
   tmpl->SetHiddenPrototype(true);
-  tmpl->InstanceTemplate()->Set(
-      String::NewFromUtf8(v8_isolate, "foo"), Number::New(v8_isolate, 75));
-  Handle<Object> proto = tmpl->GetFunction()->NewInstance();
-  Handle<Object> obj = Object::New(v8_isolate);
-  obj->SetPrototype(proto);
-  context->Global()->Set(String::NewFromUtf8(v8_isolate, "obj"), obj);
-  context->Global()->Set(String::NewFromUtf8(v8_isolate, "proto"),
-                         proto);
+  tmpl->InstanceTemplate()->Set(v8_str("foo"), Number::New(v8_isolate, 75));
+  Local<Function> function =
+      tmpl->GetFunction(v8::Isolate::GetCurrent()->GetCurrentContext())
+          .ToLocalChecked();
+  Local<Object> proto =
+      function->NewInstance(v8::Isolate::GetCurrent()->GetCurrentContext())
+          .ToLocalChecked();
+  Local<Object> obj = Object::New(v8_isolate);
+  obj->SetPrototype(v8::Isolate::GetCurrent()->GetCurrentContext(), proto)
+      .FromJust();
+  context->Global()
+      ->Set(v8::Isolate::GetCurrent()->GetCurrentContext(), v8_str("obj"), obj)
+      .FromJust();
+  context->Global()
+      ->Set(v8::Isolate::GetCurrent()->GetCurrentContext(), v8_str("proto"),
+            proto)
+      .FromJust();
   CompileRun(
       "var records;"
       "function observer(r) { records = r; };"
       "Object.observe(obj, observer);"
       "obj.foo = 41;"  // triggers a notification
       "proto.foo = 42;");  // does not trigger a notification
   const RecordExpectation expected_records[] = {
     { obj, "update", "foo", Number::New(v8_isolate, 75) }
   };
   EXPECT_RECORDS(CompileRun("records"), expected_records);
-  obj->SetPrototype(Null(v8_isolate));
+  obj->SetPrototype(v8::Isolate::GetCurrent()->GetCurrentContext(),
+                    Null(v8_isolate))
+      .FromJust();
   CompileRun("obj.foo = 43");
   const RecordExpectation expected_records2[] = {
-    { obj, "add", "foo", Handle<Value>() }
-  };
+      {obj, "add", "foo", Local<Value>()}};
   EXPECT_RECORDS(CompileRun("records"), expected_records2);
-  obj->SetPrototype(proto);
+  obj->SetPrototype(v8::Isolate::GetCurrent()->GetCurrentContext(), proto)
+      .FromJust();
   CompileRun(
       "Object.observe(proto, observer);"
       "proto.bar = 1;"
       "Object.unobserve(obj, observer);"
       "obj.foo = 44;");
   const RecordExpectation expected_records3[] = {
-    { proto, "add", "bar", Handle<Value>() }
-    // TODO(adamk): The below record should be emitted since proto is observed
-    // and has been modified. Not clear if this happens in practice.
-    // { proto, "update", "foo", Number::New(43) }
+      {proto, "add", "bar", Local<Value>()}
+      // TODO(adamk): The below record should be emitted since proto is observed
+      // and has been modified. Not clear if this happens in practice.
+      // { proto, "update", "foo", Number::New(43) }
   };
   EXPECT_RECORDS(CompileRun("records"), expected_records3);
 }
 
 
 static int NumberOfElements(i::Handle<i::JSWeakMap> map) {
   return i::ObjectHashTable::cast(map->table())->NumberOfElements();
 }
 
 
@@ skipping 21 matching lines @@
   CHECK_EQ(1, NumberOfElements(callbackInfoMap));
   CHECK_EQ(1, NumberOfElements(objectInfoMap));
   CHECK_EQ(1, NumberOfElements(notifierObjectInfoMap));
   i_isolate->heap()->CollectAllGarbage();
   CHECK_EQ(0, NumberOfElements(callbackInfoMap));
   CHECK_EQ(0, NumberOfElements(objectInfoMap));
   CHECK_EQ(0, NumberOfElements(notifierObjectInfoMap));
 }
 
 
-static int TestObserveSecurity(Handle<Context> observer_context,
-                               Handle<Context> object_context,
-                               Handle<Context> mutation_context) {
+static int TestObserveSecurity(Local<Context> observer_context,
+                               Local<Context> object_context,
+                               Local<Context> mutation_context) {
   Context::Scope observer_scope(observer_context);
   CompileRun("var records = null;"
              "var observer = function(r) { records = r };");
-  Handle<Value> observer = CompileRun("observer");
+  Local<Value> observer = CompileRun("observer");
   {
     Context::Scope object_scope(object_context);
-    object_context->Global()->Set(
-        String::NewFromUtf8(CcTest::isolate(), "observer"), observer);
+    object_context->Global()
+        ->Set(v8::Isolate::GetCurrent()->GetCurrentContext(),
+              v8_str("observer"), observer)
+        .FromJust();
     CompileRun("var obj = {};"
                "obj.length = 0;"
                "Object.observe(obj, observer,"
                    "['add', 'update', 'delete','reconfigure','splice']"
                ");");
-    Handle<Value> obj = CompileRun("obj");
+    Local<Value> obj = CompileRun("obj");
     {
       Context::Scope mutation_scope(mutation_context);
-      mutation_context->Global()->Set(
-          String::NewFromUtf8(CcTest::isolate(), "obj"), obj);
+      mutation_context->Global()
+          ->Set(v8::Isolate::GetCurrent()->GetCurrentContext(), v8_str("obj"),
+                obj)
+          .FromJust();
       CompileRun("obj.foo = 'bar';"
                  "obj.foo = 'baz';"
                  "delete obj.foo;"
                  "Object.defineProperty(obj, 'bar', {value: 'bot'});"
                  "Array.prototype.push.call(obj, 1, 2, 3);"
                  "Array.prototype.splice.call(obj, 1, 2, 2, 4);"
                  "Array.prototype.pop.call(obj);"
                  "Array.prototype.shift.call(obj);");
     }
   }
-  return CompileRun("records ? records.length : 0")->Int32Value();
+  return ToInt32_t(CompileRun("records ? records.length : 0"));
 }
 
 
 TEST(ObserverSecurityAAA) {
   v8::Isolate* isolate = CcTest::isolate();
   v8::HandleScope scope(isolate);
   v8::Local<Context> contextA = Context::New(isolate);
   CHECK_EQ(8, TestObserveSecurity(contextA, contextA, contextA));
 }
 
@@ skipping 92 matching lines @@
   v8::Isolate* isolate = CcTest::isolate();
   v8::HandleScope scope(isolate);
   v8::Local<Context> contextA = Context::New(isolate);
   v8::Local<Context> contextB = Context::New(isolate);
 
   Context::Scope scopeA(contextA);
   CompileRun("var obj = {};"
              "var recordsA = null;"
              "var observerA = function(r) { recordsA = r };"
              "Object.observe(obj, observerA);");
-  Handle<Value> obj = CompileRun("obj");
+  Local<Value> obj = CompileRun("obj");
 
   {
     Context::Scope scopeB(contextB);
-    contextB->Global()->Set(String::NewFromUtf8(CcTest::isolate(), "obj"), obj);
+    contextB->Global()
+        ->Set(v8::Isolate::GetCurrent()->GetCurrentContext(), v8_str("obj"),
+              obj)
+        .FromJust();
     CompileRun("var recordsB = null;"
                "var observerB = function(r) { recordsB = r };"
                "Object.observe(obj, observerB);");
   }
 
   CompileRun("var notifier = Object.getNotifier(obj);"
              "notifier.notify({ type: 'update' });");
-  CHECK_EQ(1, CompileRun("recordsA ? recordsA.length : 0")->Int32Value());
+  CHECK_EQ(1, ToInt32_t(CompileRun("recordsA ? recordsA.length : 0")));
 
   {
     Context::Scope scopeB(contextB);
-    CHECK_EQ(0, CompileRun("recordsB ? recordsB.length : 0")->Int32Value());
+    CHECK_EQ(0, ToInt32_t(CompileRun("recordsB ? recordsB.length : 0")));
   }
 }
 
 
 TEST(HiddenPropertiesLeakage) {
   HandleScope scope(CcTest::isolate());
   LocalContext context(CcTest::isolate());
   CompileRun("var obj = {};"
              "var records = null;"
              "var observer = function(r) { records = r };"
              "Object.observe(obj, observer);");
-  Handle<Value> obj =
-      context->Global()->Get(String::NewFromUtf8(CcTest::isolate(), "obj"));
-  Handle<Object>::Cast(obj)
-      ->SetHiddenValue(String::NewFromUtf8(CcTest::isolate(), "foo"),
-                       Null(CcTest::isolate()));
+  Local<Value> obj =
+      context->Global()
+          ->Get(v8::Isolate::GetCurrent()->GetCurrentContext(), v8_str("obj"))
+          .ToLocalChecked();
+  Local<Object>::Cast(obj)
+      ->SetHiddenValue(v8_str("foo"), Null(CcTest::isolate()));
   CompileRun("");  // trigger delivery
   CHECK(CompileRun("records")->IsNull());
 }
 
 
 TEST(GetNotifierFromOtherContext) {
   HandleScope scope(CcTest::isolate());
   LocalContext context(CcTest::isolate());
   CompileRun("var obj = {};");
-  Handle<Value> instance = CompileRun("obj");
+  Local<Value> instance = CompileRun("obj");
   {
     LocalContext context2(CcTest::isolate());
-    context2->Global()->Set(String::NewFromUtf8(CcTest::isolate(), "obj"),
-                            instance);
+    context2->Global()
+        ->Set(v8::Isolate::GetCurrent()->GetCurrentContext(), v8_str("obj"),
+              instance)
+        .FromJust();
     CHECK(CompileRun("Object.getNotifier(obj)")->IsNull());
   }
 }
 
 
 TEST(GetNotifierFromOtherOrigin) {
   HandleScope scope(CcTest::isolate());
-  Handle<Value> foo = String::NewFromUtf8(CcTest::isolate(), "foo");
-  Handle<Value> bar = String::NewFromUtf8(CcTest::isolate(), "bar");
+  Local<Value> foo = v8_str("foo");
+  Local<Value> bar = v8_str("bar");
   LocalContext context(CcTest::isolate());
   context->SetSecurityToken(foo);
   CompileRun("var obj = {};");
-  Handle<Value> instance = CompileRun("obj");
+  Local<Value> instance = CompileRun("obj");
   {
     LocalContext context2(CcTest::isolate());
     context2->SetSecurityToken(bar);
-    context2->Global()->Set(String::NewFromUtf8(CcTest::isolate(), "obj"),
-                            instance);
+    context2->Global()
+        ->Set(v8::Isolate::GetCurrent()->GetCurrentContext(), v8_str("obj"),
+              instance)
+        .FromJust();
     CHECK(CompileRun("Object.getNotifier(obj)")->IsNull());
   }
 }
 
 
 TEST(GetNotifierFromSameOrigin) {
   HandleScope scope(CcTest::isolate());
-  Handle<Value> foo = String::NewFromUtf8(CcTest::isolate(), "foo");
+  Local<Value> foo = v8_str("foo");
   LocalContext context(CcTest::isolate());
   context->SetSecurityToken(foo);
   CompileRun("var obj = {};");
-  Handle<Value> instance = CompileRun("obj");
+  Local<Value> instance = CompileRun("obj");
   {
     LocalContext context2(CcTest::isolate());
     context2->SetSecurityToken(foo);
-    context2->Global()->Set(String::NewFromUtf8(CcTest::isolate(), "obj"),
-                            instance);
+    context2->Global()
+        ->Set(v8::Isolate::GetCurrent()->GetCurrentContext(), v8_str("obj"),
+              instance)
+        .FromJust();
     CHECK(CompileRun("Object.getNotifier(obj)")->IsObject());
   }
 }
 
 
 static int GetGlobalObjectsCount() {
   int count = 0;
   i::HeapIterator it(CcTest::heap());
   for (i::HeapObject* object = it.next(); object != NULL; object = it.next())
     if (object->IsJSGlobalObject()) count++;
@@ skipping 12 matching lines @@
   int count = GetGlobalObjectsCount();
 #ifdef DEBUG
   if (count != expected) CcTest::heap()->TracePathToGlobal();
 #endif
   CHECK_EQ(expected, count);
 }
 
 
 TEST(DontLeakContextOnObserve) {
   HandleScope scope(CcTest::isolate());
-  Handle<Value> foo = String::NewFromUtf8(CcTest::isolate(), "foo");
+  Local<Value> foo = v8_str("foo");
   LocalContext context(CcTest::isolate());
   context->SetSecurityToken(foo);
   CompileRun("var obj = {};");
-  Handle<Value> object = CompileRun("obj");
+  Local<Value> object = CompileRun("obj");
   {
     HandleScope scope(CcTest::isolate());
     LocalContext context2(CcTest::isolate());
     context2->SetSecurityToken(foo);
-    context2->Global()->Set(String::NewFromUtf8(CcTest::isolate(), "obj"),
-                            object);
+    context2->Global()
+        ->Set(v8::Isolate::GetCurrent()->GetCurrentContext(), v8_str("obj"),
+              object)
+        .FromJust();
     CompileRun("function observer() {};"
                "Object.observe(obj, observer, ['foo', 'bar', 'baz']);"
                "Object.unobserve(obj, observer);");
   }
 
   CcTest::isolate()->ContextDisposedNotification();
   CheckSurvivingGlobalObjectsCount(2);
 }
 
 
 TEST(DontLeakContextOnGetNotifier) {
   HandleScope scope(CcTest::isolate());
-  Handle<Value> foo = String::NewFromUtf8(CcTest::isolate(), "foo");
+  Local<Value> foo = v8_str("foo");
   LocalContext context(CcTest::isolate());
   context->SetSecurityToken(foo);
   CompileRun("var obj = {};");
-  Handle<Value> object = CompileRun("obj");
+  Local<Value> object = CompileRun("obj");
   {
     HandleScope scope(CcTest::isolate());
     LocalContext context2(CcTest::isolate());
     context2->SetSecurityToken(foo);
-    context2->Global()->Set(String::NewFromUtf8(CcTest::isolate(), "obj"),
-                            object);
+    context2->Global()
+        ->Set(v8::Isolate::GetCurrent()->GetCurrentContext(), v8_str("obj"),
+              object)
+        .FromJust();
     CompileRun("Object.getNotifier(obj);");
   }
 
   CcTest::isolate()->ContextDisposedNotification();
   CheckSurvivingGlobalObjectsCount(2);
 }
 
 
 TEST(DontLeakContextOnNotifierPerformChange) {
   HandleScope scope(CcTest::isolate());
-  Handle<Value> foo = String::NewFromUtf8(CcTest::isolate(), "foo");
+  Local<Value> foo = v8_str("foo");
   LocalContext context(CcTest::isolate());
   context->SetSecurityToken(foo);
   CompileRun("var obj = {};");
-  Handle<Value> object = CompileRun("obj");
-  Handle<Value> notifier = CompileRun("Object.getNotifier(obj)");
+  Local<Value> object = CompileRun("obj");
+  Local<Value> notifier = CompileRun("Object.getNotifier(obj)");
   {
     HandleScope scope(CcTest::isolate());
     LocalContext context2(CcTest::isolate());
     context2->SetSecurityToken(foo);
-    context2->Global()->Set(String::NewFromUtf8(CcTest::isolate(), "obj"),
-                            object);
-    context2->Global()->Set(String::NewFromUtf8(CcTest::isolate(), "notifier"),
-                            notifier);
+    context2->Global()
+        ->Set(v8::Isolate::GetCurrent()->GetCurrentContext(), v8_str("obj"),
+              object)
+        .FromJust();
+    context2->Global()
+        ->Set(v8::Isolate::GetCurrent()->GetCurrentContext(),
+              v8_str("notifier"), notifier)
+        .FromJust();
     CompileRun("var obj2 = {};"
                "var notifier2 = Object.getNotifier(obj2);"
                "notifier2.performChange.call("
                    "notifier, 'foo', function(){})");
   }
 
   CcTest::isolate()->ContextDisposedNotification();
   CheckSurvivingGlobalObjectsCount(2);
 }
 
 
 static void ObserverCallback(const FunctionCallbackInfo<Value>& args) {
-  *static_cast<int*>(Handle<External>::Cast(args.Data())->Value()) =
-      Handle<Array>::Cast(args[0])->Length();
+  *static_cast<int*>(Local<External>::Cast(args.Data())->Value()) =
+      Local<Array>::Cast(args[0])->Length();
 }
 
 
 TEST(ObjectObserveCallsCppFunction) {
   Isolate* isolate = CcTest::isolate();
   HandleScope scope(isolate);
   LocalContext context(isolate);
   int numRecordsSent = 0;
-  Handle<Function> observer =
-      Function::New(CcTest::isolate(), ObserverCallback,
-                    External::New(isolate, &numRecordsSent));
-  context->Global()->Set(String::NewFromUtf8(CcTest::isolate(), "observer"),
-                         observer);
+  Local<Function> observer =
+      Function::New(CcTest::isolate()->GetCurrentContext(), ObserverCallback,
+                    External::New(isolate, &numRecordsSent))
+          .ToLocalChecked();
+  context->Global()
+      ->Set(v8::Isolate::GetCurrent()->GetCurrentContext(), v8_str("observer"),
+            observer)
+      .FromJust();
   CompileRun(
       "var obj = {};"
       "Object.observe(obj, observer);"
       "obj.foo = 1;"
       "obj.bar = 2;");
   CHECK_EQ(2, numRecordsSent);
 }
 
 
 TEST(ObjectObserveCallsFunctionTemplateInstance) {
   Isolate* isolate = CcTest::isolate();
   HandleScope scope(isolate);
   LocalContext context(isolate);
   int numRecordsSent = 0;
-  Handle<FunctionTemplate> tmpl = FunctionTemplate::New(
+  Local<FunctionTemplate> tmpl = FunctionTemplate::New(
       isolate, ObserverCallback, External::New(isolate, &numRecordsSent));
-  context->Global()->Set(String::NewFromUtf8(CcTest::isolate(), "observer"),
-                         tmpl->GetFunction());
+  Local<Function> function =
+      tmpl->GetFunction(v8::Isolate::GetCurrent()->GetCurrentContext())
+          .ToLocalChecked();
+  context->Global()
+      ->Set(v8::Isolate::GetCurrent()->GetCurrentContext(), v8_str("observer"),
+            function)
+      .FromJust();
   CompileRun(
       "var obj = {};"
       "Object.observe(obj, observer);"
       "obj.foo = 1;"
       "obj.bar = 2;");
   CHECK_EQ(2, numRecordsSent);
 }
 
 
-static void AccessorGetter(Local<String> property,
+static void AccessorGetter(Local<Name> property,
                            const PropertyCallbackInfo<Value>& info) {
   info.GetReturnValue().Set(Integer::New(info.GetIsolate(), 42));
 }
 
 
-static void AccessorSetter(Local<String> property, Local<Value> value,
+static void AccessorSetter(Local<Name> property, Local<Value> value,
                            const PropertyCallbackInfo<void>& info) {
   info.GetReturnValue().SetUndefined();
 }
 
 
 TEST(APIAccessorsShouldNotNotify) {
   Isolate* isolate = CcTest::isolate();
   HandleScope handle_scope(isolate);
   LocalContext context(isolate);
-  Handle<Object> object = Object::New(isolate);
-  object->SetAccessor(String::NewFromUtf8(isolate, "accessor"), &AccessorGetter,
-                      &AccessorSetter);
-  context->Global()->Set(String::NewFromUtf8(isolate, "obj"), object);
+  Local<Object> object = Object::New(isolate);
+  object->SetAccessor(v8::Isolate::GetCurrent()->GetCurrentContext(),
+                      v8_str("accessor"), &AccessorGetter, &AccessorSetter)
+      .FromJust();
+  context->Global()
+      ->Set(v8::Isolate::GetCurrent()->GetCurrentContext(), v8_str("obj"),
+            object)
+      .FromJust();
   CompileRun(
       "var records = null;"
       "Object.observe(obj, function(r) { records = r });"
       "obj.accessor = 43;");
   CHECK(CompileRun("records")->IsNull());
   CompileRun("Object.defineProperty(obj, 'accessor', { value: 44 });");
   CHECK(CompileRun("records")->IsNull());
 }
 
 
@@ skipping 56 matching lines @@
 }
 
 
 TEST(DisallowObserveAccessCheckedObject) {
   v8::Isolate* isolate = CcTest::isolate();
   v8::HandleScope scope(isolate);
   LocalContext env;
   v8::Local<v8::ObjectTemplate> object_template =
       v8::ObjectTemplate::New(isolate);
   object_template->SetAccessCheckCallbacks(NamedAccessCheckAlwaysAllow, NULL);
-  env->Global()->Set(v8_str("obj"), object_template->NewInstance());
+  Local<Object> new_instance =
+      object_template->NewInstance(
+                         v8::Isolate::GetCurrent()->GetCurrentContext())
+          .ToLocalChecked();
+  env->Global()
+      ->Set(v8::Isolate::GetCurrent()->GetCurrentContext(), v8_str("obj"),
+            new_instance)
+      .FromJust();
   v8::TryCatch try_catch(isolate);
   CompileRun("Object.observe(obj, function(){})");
   CHECK(try_catch.HasCaught());
 }
 
 
 TEST(DisallowGetNotifierAccessCheckedObject) {
   v8::Isolate* isolate = CcTest::isolate();
   v8::HandleScope scope(isolate);
   LocalContext env;
   v8::Local<v8::ObjectTemplate> object_template =
       v8::ObjectTemplate::New(isolate);
   object_template->SetAccessCheckCallbacks(NamedAccessCheckAlwaysAllow, NULL);
-  env->Global()->Set(v8_str("obj"), object_template->NewInstance());
+  Local<Object> new_instance =
+      object_template->NewInstance(
+                         v8::Isolate::GetCurrent()->GetCurrentContext())
+          .ToLocalChecked();
+  env->Global()
+      ->Set(v8::Isolate::GetCurrent()->GetCurrentContext(), v8_str("obj"),
+            new_instance)
+      .FromJust();
   v8::TryCatch try_catch(isolate);
   CompileRun("Object.getNotifier(obj)");
   CHECK(try_catch.HasCaught());
 }