| Index: test/cctest/test-lockers.cc
|
| diff --git a/test/cctest/test-lockers.cc b/test/cctest/test-lockers.cc
|
| index 9069998fefbf32dd6fc71eaaba69572161dd53da..cbca2e2429334cf9f0ce2c788a7819719d2e5382 100644
|
| --- a/test/cctest/test-lockers.cc
|
| +++ b/test/cctest/test-lockers.cc
|
| @@ -69,8 +69,7 @@ class KangarooThread : public v8::base::Thread {
|
| {
|
| v8::Locker locker(isolate_);
|
| v8::Isolate::Scope isolate_scope(isolate_);
|
| - CHECK_EQ(reinterpret_cast<v8::internal::Isolate*>(isolate_),
|
| - v8::internal::Isolate::Current());
|
| + CHECK_EQ(isolate_, v8::Isolate::GetCurrent());
|
| v8::HandleScope scope(isolate_);
|
| v8::Local<v8::Context> context =
|
| v8::Local<v8::Context>::New(isolate_, context_);
|
| @@ -111,8 +110,7 @@ TEST(KangarooIsolates) {
|
| v8::HandleScope handle_scope(isolate);
|
| v8::Local<v8::Context> context = v8::Context::New(isolate);
|
| v8::Context::Scope context_scope(context);
|
| - CHECK_EQ(reinterpret_cast<v8::internal::Isolate*>(isolate),
|
| - v8::internal::Isolate::Current());
|
| + CHECK_EQ(isolate, v8::Isolate::GetCurrent());
|
| CompileRun("function getValue() { return 30; }");
|
| thread1.Reset(new KangarooThread(isolate, context));
|
| }
|
| @@ -190,8 +188,7 @@ class IsolateLockingThreadWithLocalContext : public JoinableThread {
|
| 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());
|
| + CHECK_EQ(isolate_, v8::Isolate::GetCurrent());
|
| CalcFibAndCheck(local_context.local());
|
| }
|
| private:
|
| @@ -688,11 +685,12 @@ class IsolateGenesisThread : public JoinableThread {
|
| v8::Isolate* isolate = v8::Isolate::New(create_params);
|
| {
|
| v8::Isolate::Scope isolate_scope(isolate);
|
| - CHECK(!i::Isolate::Current()->has_installed_extensions());
|
| + CHECK(
|
| + !reinterpret_cast<i::Isolate*>(isolate)->has_installed_extensions());
|
| v8::ExtensionConfiguration extensions(count_, extension_names_);
|
| v8::HandleScope handle_scope(isolate);
|
| v8::Context::New(isolate, &extensions);
|
| - CHECK(i::Isolate::Current()->has_installed_extensions());
|
| + CHECK(reinterpret_cast<i::Isolate*>(isolate)->has_installed_extensions());
|
| }
|
| isolate->Dispose();
|
| }
|
|
|