Extensions: pass ChromeV8Context around instead of v8::Handle.

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/strings/string_piece.h"
 #include "chrome/renderer/extensions/object_backed_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 {
  public:
-  explicit AssertNatives(v8::Handle<v8::Context> context)
+  explicit AssertNatives(extensions::ChromeV8Context* context)
       : ObjectBackedNativeHandler(context),
         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_; }
@@ skipping 46 matching lines @@
 class FailsOnException : public ModuleSystem::ExceptionHandler {
  public:
   virtual void HandleUncaughtException() OVERRIDE {
     FAIL();
   }
 };
 
 ModuleSystemTest::ModuleSystemTest()
     : isolate_(v8::Isolate::GetCurrent()),
       handle_scope_(isolate_),
-      context_(v8::Context::New(isolate_)),
+      context_(
+          new extensions::ChromeV8Context(
+              v8::Context::New(isolate_),
+              reinterpret_cast<WebKit::WebFrame*>(1),
+              NULL,
+              extensions::Feature::UNSPECIFIED_CONTEXT)),
       source_map_(new StringSourceMap()),
       should_assertions_be_made_(true) {
-  context_->Enter();
+  context_->v8_context()->Enter();
   assert_natives_ = new AssertNatives(context_.get());
-  module_system_.reset(new ModuleSystem(context_.get(), source_map_.get()));
+  module_system_.reset(
+      new ModuleSystem(context_.get(), source_map_.get()));
   module_system_->RegisterNativeHandler("assert", scoped_ptr<NativeHandler>(
       assert_natives_));
   module_system_->SetExceptionHandlerForTest(
       scoped_ptr<ModuleSystem::ExceptionHandler>(new FailsOnException));
 }
 
 ModuleSystemTest::~ModuleSystemTest() {
   module_system_.reset();
-  context_->Exit();
+  context_->v8_context()->Exit();

[not at google - send to devlin, 2013/05/29 17:41:55]

idly wonder why this doesn't hold onto a context scope as a member. whatever,
nothing to do with this patch.

 }
 
 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);
 }