2 files changed, 7 insertions, 5 deletions
diff --git a/gin/test/file_runner.cc b/gin/test/file_runner.cc
index 7b91273..86cb2f3 100644
--- a/gin/test/file_runner.cc
+++ b/gin/test/file_runner.cc
@@ -10,6 +10,7 @@
 #include "gin/converter.h"
 #include "gin/modules/console.h"
 #include "gin/modules/module_registry.h"
+#include "gin/public/context_holder.h"
 #include "gin/public/isolate_holder.h"
 #include "gin/test/gtest.h"
 #include "gin/try_catch.h"
@@ -38,7 +39,7 @@ FileRunnerDelegate::FileRunnerDelegate()
 FileRunnerDelegate::~FileRunnerDelegate() {
 }
 
-void FileRunnerDelegate::UnhandledException(Runner* runner,
+void FileRunnerDelegate::UnhandledException(ShellRunner* runner,
                                             TryCatch& try_catch) {
   ModuleRunnerDelegate::UnhandledException(runner, try_catch);
   FAIL() << try_catch.GetStackTrace();
@@ -53,7 +54,7 @@ void RunTestFromFile(const base::FilePath& path, FileRunnerDelegate* delegate,
   base::MessageLoop message_loop;
 
   gin::IsolateHolder instance;
-  gin::Runner runner(delegate, instance.isolate());
+  gin::ShellRunner runner(delegate, instance.isolate());
   {
     gin::Runner::Scope scope(&runner);
     v8::V8::SetCaptureStackTraceForUncaughtExceptions(true);
@@ -65,8 +66,8 @@ void RunTestFromFile(const base::FilePath& path, FileRunnerDelegate* delegate,
       message_loop.Run();
     }
 
-    v8::Handle<v8::Value> result = runner.context()->Global()->Get(
-        StringToSymbol(runner.isolate(), "result"));
+    v8::Handle<v8::Value> result = runner.global()->Get(
+        StringToSymbol(runner.GetContextHolder()->isolate(), "result"));
     EXPECT_EQ("PASS", V8ToString(result));
   }
 }
diff --git a/gin/test/file_runner.h b/gin/test/file_runner.h
index 267023d..f248fb5 100644
--- a/gin/test/file_runner.h
+++ b/gin/test/file_runner.h
@@ -24,7 +24,8 @@ class FileRunnerDelegate : public ModuleRunnerDelegate {
 
  private:
   // From ModuleRunnerDelegate:
-  virtual void UnhandledException(Runner* runner, TryCatch& try_catch) OVERRIDE;
+  virtual void UnhandledException(ShellRunner* runner,
+                                  TryCatch& try_catch) OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(FileRunnerDelegate);
 };