Revert 184837

chrome/renderer/extensions/module_system_unittest.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/memory/scoped_ptr.h"
 #include "chrome/renderer/extensions/module_system.h"
 
-// TODO(cduvall/kalman): Put this file in extensions namespace.
 using extensions::ModuleSystem;
 using extensions::NativeHandler;
-using extensions::ObjectBackedNativeHandler;
 
-class CounterNatives : public ObjectBackedNativeHandler {
+class CounterNatives : public NativeHandler {
  public:
-  explicit CounterNatives(v8::Handle<v8::Context> context)
-      : ObjectBackedNativeHandler(context), counter_(0) {
+  explicit CounterNatives(v8::Isolate* isolate)
+      : NativeHandler(isolate), counter_(0) {
     RouteFunction("Get", base::Bind(&CounterNatives::Get,
         base::Unretained(this)));
     RouteFunction("Increment", base::Bind(&CounterNatives::Increment,
         base::Unretained(this)));
   }
 
   v8::Handle<v8::Value> Get(const v8::Arguments& args) {
     return v8::Integer::New(counter_);
   }
 
@@ skipping 140 matching lines @@
       "assert.AssertTrue(object.thing.y() == 10);"
       "assert.AssertTrue(object.thing.z == 1);"
       );
   module_system_->Require("test");
 }
 
 TEST_F(ModuleSystemTest, TestLazyFieldIsOnlyEvaledOnce) {
   ModuleSystem::NativesEnabledScope natives_enabled_scope(module_system_.get());
   module_system_->RegisterNativeHandler(
       "counter",
-      scoped_ptr<NativeHandler>(new CounterNatives(v8::Context::GetCurrent())));
+      scoped_ptr<NativeHandler>(new CounterNatives(v8::Isolate::GetCurrent())));
   RegisterModule("lazy",
       "requireNative('counter').Increment();"
       "exports.x = 5;");
 
   v8::Handle<v8::Object> object = CreateGlobal("object");
 
   module_system_->SetLazyField(object, "x", "lazy", "x");
 
   RegisterModule("test",
       "var assert = requireNative('assert');"
@@ skipping 33 matching lines @@
   RegisterModule("test",
       "var assert = requireNative('assert');"
       "assert.AssertTrue(object.thing.x == 5);");
   module_system_->Require("test");
 }
 
 TEST_F(ModuleSystemTest, TestModulesOnlyGetEvaledOnce) {
   ModuleSystem::NativesEnabledScope natives_enabled_scope(module_system_.get());
   module_system_->RegisterNativeHandler(
       "counter",
-      scoped_ptr<NativeHandler>(new CounterNatives(v8::Context::GetCurrent())));
+      scoped_ptr<NativeHandler>(new CounterNatives(v8::Isolate::GetCurrent())));
 
   RegisterModule("incrementsWhenEvaled",
       "requireNative('counter').Increment();");
   RegisterModule("test",
       "var assert = requireNative('assert');"
       "var counter = requireNative('counter');"
       "assert.AssertTrue(counter.Get() == 0);"
       "require('incrementsWhenEvaled');"
       "assert.AssertTrue(counter.Get() == 1);"
       "require('incrementsWhenEvaled');"
@@ skipping 11 matching lines @@
 }
 
 TEST_F(ModuleSystemTest, TestOverrideNonExistentNativeHandler) {
   ModuleSystem::NativesEnabledScope natives_enabled_scope(module_system_.get());
   OverrideNativeHandler("thing", "exports.x = 5;");
   RegisterModule("test",
       "var assert = requireNative('assert');"
       "assert.AssertTrue(requireNative('thing').x == 5);");
   module_system_->Require("test");
 }