| Index: src/isolate.h | 
| diff --git a/src/isolate.h b/src/isolate.h | 
| index 567ef6615b56369051cb4184f951e75cd9457775..f19b455baf31ad5893fa671af1cfbc58382a9eab 100644 | 
| --- a/src/isolate.h | 
| +++ b/src/isolate.h | 
| @@ -1411,9 +1411,9 @@ class SaveContext BASE_EMBEDDED { | 
| class AssertNoContextChange BASE_EMBEDDED { | 
| #ifdef DEBUG | 
| public: | 
| -  AssertNoContextChange() | 
| -    : isolate_(Isolate::Current()), | 
| -      context_(isolate_->context()) { } | 
| +  explicit AssertNoContextChange(Isolate* isolate) | 
| +    : isolate_(isolate), | 
| +      context_(isolate->context(), isolate) { } | 
| ~AssertNoContextChange() { | 
| ASSERT(isolate_->context() == *context_); | 
| } | 
| @@ -1423,32 +1423,7 @@ class AssertNoContextChange BASE_EMBEDDED { | 
| Handle<Context> context_; | 
| #else | 
| public: | 
| -  AssertNoContextChange() { } | 
| -#endif | 
| -}; | 
| - | 
| - | 
| -// TODO(mstarzinger): Depracate as soon as everything is handlified. | 
| -class AssertNoContextChangeWithHandleScope BASE_EMBEDDED { | 
| -#ifdef DEBUG | 
| - public: | 
| -  AssertNoContextChangeWithHandleScope() : | 
| -      isolate_(Isolate::Current()), | 
| -      scope_(isolate_), | 
| -      context_(isolate_->context(), isolate_) { | 
| -  } | 
| - | 
| -  ~AssertNoContextChangeWithHandleScope() { | 
| -    ASSERT(isolate_->context() == *context_); | 
| -  } | 
| - | 
| - private: | 
| -  Isolate* isolate_; | 
| -  HandleScope scope_; | 
| -  Handle<Context> context_; | 
| -#else | 
| - public: | 
| -  AssertNoContextChangeWithHandleScope() { } | 
| +  explicit AssertNoContextChange(Isolate* isolate) { } | 
| #endif | 
| }; | 
|  | 
|  |