Move context retrieval method around. Use delegation for implementation.

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