Don't create a gin::IsolateHolder in extensions unittests.

extensions/renderer/module_system_test.cc

 // Copyright 2014 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 "extensions/renderer/module_system_test.h"
 
 #include <map>
 #include <string>
 
 #include "base/callback.h"
@@ skipping 103 matching lines @@
 
   void RegisterModule(const std::string& name, const std::string& source) {
     CHECK_EQ(0u, source_map_.count(name)) << "Module " << name << " not found";
     source_map_[name] = source;
   }
 
  private:
   std::map<std::string, std::string> source_map_;
 };
 
-ModuleSystemTestEnvironment::ModuleSystemTestEnvironment(
-    gin::IsolateHolder* isolate_holder)
-    : isolate_holder_(isolate_holder),
-      context_holder_(new gin::ContextHolder(isolate_holder_->isolate())),
-      handle_scope_(isolate_holder_->isolate()),
+ModuleSystemTestEnvironment::ModuleSystemTestEnvironment(v8::Isolate* isolate)
+    : isolate_(isolate),
+      context_holder_(new gin::ContextHolder(isolate_)),
+      handle_scope_(isolate_),
       source_map_(new StringSourceMap()) {
-  context_holder_->SetContext(
-      v8::Context::New(isolate_holder->isolate(),
-                       g_v8_extension_configurator.Get().GetConfiguration()));
+  context_holder_->SetContext(v8::Context::New(
+      isolate, g_v8_extension_configurator.Get().GetConfiguration()));
   context_.reset(new ScriptContext(context_holder_->context(),
                                    NULL,  // WebFrame
                                    NULL,  // Extension
                                    Feature::UNSPECIFIED_CONTEXT));
   context_->v8_context()->Enter();
   assert_natives_ = new AssertNatives(context_.get());
 
   {
     scoped_ptr<ModuleSystem> module_system(
         new ModuleSystem(context_.get(), source_map_.get()));
@@ skipping 52 matching lines @@
   context_holder_.reset();
 }
 
 void ModuleSystemTestEnvironment::ShutdownModuleSystem() {
   context_->v8_context()->Exit();
   context_.reset();
 }
 
 v8::Handle<v8::Object> ModuleSystemTestEnvironment::CreateGlobal(
     const std::string& name) {
-  v8::Isolate* isolate = isolate_holder_->isolate();
-  v8::EscapableHandleScope handle_scope(isolate);
-  v8::Local<v8::Object> object = v8::Object::New(isolate);
-  isolate->GetCurrentContext()->Global()->Set(
-      v8::String::NewFromUtf8(isolate, name.c_str()), object);
+  v8::EscapableHandleScope handle_scope(isolate_);
+  v8::Local<v8::Object> object = v8::Object::New(isolate_);
+  isolate_->GetCurrentContext()->Global()->Set(
+      v8::String::NewFromUtf8(isolate_, name.c_str()), object);
   return handle_scope.Escape(object);
 }
 
 ModuleSystemTest::ModuleSystemTest()
-    : isolate_holder_(v8::Isolate::GetCurrent(), NULL),
+    : isolate_(v8::Isolate::GetCurrent()),
       env_(CreateEnvironment()),
       should_assertions_be_made_(true) {
 }
 
 ModuleSystemTest::~ModuleSystemTest() {
 }
 
 void ModuleSystemTest::TearDown() {
   // All tests must assert at least once unless otherwise specified.
   EXPECT_EQ(should_assertions_be_made_,
             env_->assert_natives()->assertion_made());
   EXPECT_FALSE(env_->assert_natives()->failed());
 }
 
 scoped_ptr<ModuleSystemTestEnvironment> ModuleSystemTest::CreateEnvironment() {
-  return make_scoped_ptr(new ModuleSystemTestEnvironment(&isolate_holder_));
+  return make_scoped_ptr(new ModuleSystemTestEnvironment(isolate_));
 }
 
 void ModuleSystemTest::ExpectNoAssertionsMade() {
   should_assertions_be_made_ = false;
 }
 
 void ModuleSystemTest::RunResolvedPromises() {
-  isolate_holder_.isolate()->RunMicrotasks();
+  isolate_->RunMicrotasks();
 }
 
 }  // namespace extensions