| Index: gin/test/file_runner.cc
|
| diff --git a/gin/test/file_runner.cc b/gin/test/file_runner.cc
|
| index 7b9127368d6591675eb5de8a195b4d6cb6dc38bd..718f150cd1439e8dc423611f5b6a26613f4822c6 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(DefaultRunner* 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::DefaultRunner 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));
|
| }
|
| }
|
|
|