Merged r14171, r14175 into trunk branch.

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 a9780f0332644af77e4ee147747e1931d3ba9362..1e789f30da847221395b9489802aacc8375187be 100644
--- a/test/cctest/test-api.cc
+++ b/test/cctest/test-api.cc
@@ -13410,6 +13410,7 @@ v8::Persistent<Context> calling_context2;
 static v8::Handle<Value> GetCallingContextCallback(const v8::Arguments& args) {
   ApiTestFuzzer::Fuzz();
   CHECK(Context::GetCurrent() == calling_context0);
+  CHECK(args.GetIsolate()->GetCurrentContext() == calling_context0);
   CHECK(Context::GetCalling() == calling_context1);
   CHECK(Context::GetEntered() == calling_context2);
   return v8::Integer::New(42);