Refactors parts of gin:

mojo/apps/js/mojo_runner_delegate.cc

Index: mojo/apps/js/mojo_runner_delegate.cc
diff --git a/mojo/apps/js/mojo_runner_delegate.cc b/mojo/apps/js/mojo_runner_delegate.cc
index c160f167682e9c780c3c853a931f3a9dba3c3939..58cb3336fe42ed5747ea201df6eb3a3ab5186bc7 100644
--- a/mojo/apps/js/mojo_runner_delegate.cc
+++ b/mojo/apps/js/mojo_runner_delegate.cc
@@ -35,7 +35,7 @@ std::vector<base::FilePath> GetModuleSearchPaths() {
 void StartCallback(base::WeakPtr<gin::Runner> runner,
                    MojoHandle pipe,
                    v8::Handle<v8::Value> module) {
-  v8::Isolate* isolate = runner->isolate();
+  v8::Isolate* isolate = runner->GetContextHolder()->isolate();
   v8::Handle<v8::Function> start;
   CHECK(gin::ConvertFromV8(isolate, module, &start));
 
@@ -63,13 +63,14 @@ void MojoRunnerDelegate::Start(gin::Runner* runner,
                                MojoHandle pipe,
                                const std::string& module) {
   gin::Runner::Scope scope(runner);
-  gin::ModuleRegistry* registry = gin::ModuleRegistry::From(runner->context());
-  registry->LoadModule(runner->isolate(), module,
+  gin::ModuleRegistry* registry =
+      gin::ModuleRegistry::From(runner->GetContextHolder()->context());
+  registry->LoadModule(runner->GetContextHolder()->isolate(), module,
                        base::Bind(StartCallback, runner->GetWeakPtr(), pipe));
   AttemptToLoadMoreModules(runner);
 }
 
-void MojoRunnerDelegate::UnhandledException(gin::Runner* runner,
+void MojoRunnerDelegate::UnhandledException(gin::ShellRunner* runner,
                                             gin::TryCatch& try_catch) {
   gin::ModuleRunnerDelegate::UnhandledException(runner, try_catch);
   LOG(ERROR) << try_catch.GetStackTrace();