Revert 184837

chrome/test/base/module_system_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/base/module_system_test.h"
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_piece.h"
-#include "chrome/renderer/extensions/object_backed_native_handler.h"
+#include "chrome/renderer/extensions/native_handler.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #include <map>
 #include <string>
 
 using extensions::ModuleSystem;
 using extensions::NativeHandler;
-using extensions::ObjectBackedNativeHandler;
 
 // Native JS functions for doing asserts.
-class AssertNatives : public ObjectBackedNativeHandler {
+class AssertNatives : public NativeHandler {
  public:
-  explicit AssertNatives(v8::Handle<v8::Context> context)
-      : ObjectBackedNativeHandler(context),
+  explicit AssertNatives(v8::Isolate* isolate)
+      : NativeHandler(isolate),
         assertion_made_(false),
         failed_(false) {
     RouteFunction("AssertTrue", base::Bind(&AssertNatives::AssertTrue,
         base::Unretained(this)));
     RouteFunction("AssertFalse", base::Bind(&AssertNatives::AssertFalse,
         base::Unretained(this)));
   }
 
   bool assertion_made() { return assertion_made_; }
   bool failed() { return failed_; }
@@ skipping 47 matching lines @@
   virtual void HandleUncaughtException() OVERRIDE {
     FAIL();
   }
 };
 
 ModuleSystemTest::ModuleSystemTest()
     : context_(v8::Context::New()),
       source_map_(new StringSourceMap()),
       should_assertions_be_made_(true) {
   context_->Enter();
-  assert_natives_ = new AssertNatives(context_);
+  assert_natives_ = new AssertNatives(context_->GetIsolate());
   module_system_.reset(new ModuleSystem(context_, source_map_.get()));
   module_system_->RegisterNativeHandler("assert", scoped_ptr<NativeHandler>(
       assert_natives_));
   module_system_->set_exception_handler(
       scoped_ptr<ModuleSystem::ExceptionHandler>(new FailsOnException));
 }
 
 ModuleSystemTest::~ModuleSystemTest() {
   module_system_.reset();
   context_->Exit();
-  context_.Dispose();
+  context_.Dispose(context_->GetIsolate());
 }
 
 void ModuleSystemTest::RegisterModule(const std::string& name,
                                       const std::string& code) {
   source_map_->RegisterModule(name, code);
 }
 
 void ModuleSystemTest::RegisterModule(const std::string& name,
                                       int resource_id) {
   const std::string& code = ResourceBundle::GetSharedInstance().
@@ skipping 18 matching lines @@
   should_assertions_be_made_ = false;
 }
 
 v8::Handle<v8::Object> ModuleSystemTest::CreateGlobal(const std::string& name) {
   v8::HandleScope handle_scope;
   v8::Handle<v8::Object> object = v8::Object::New();
   v8::Context::GetCurrent()->Global()->Set(v8::String::New(name.c_str()),
                                            object);
   return handle_scope.Close(object);
 }