[Mojo] Remove static "bootstrap" state in mojo_js

mojo/apps/js/mojo_runner_delegate.cc

 // Copyright 2013 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 "mojo/apps/js/mojo_runner_delegate.h"
 
+#include "base/bind.h"
 #include "base/path_service.h"
+#include "gin/converter.h"
 #include "gin/modules/console.h"
 #include "gin/modules/module_registry.h"
 #include "gin/try_catch.h"
-#include "mojo/apps/js/bootstrap.h"
+#include "mojo/apps/js/threading.h"
 #include "mojo/public/bindings/js/core.h"
 #include "mojo/public/bindings/js/support.h"
 
 namespace mojo {
 namespace apps {
 
 namespace {
 
 // TODO(abarth): Rather than loading these modules from the file system, we
 // should load them from the network via Mojo IPC.
 std::vector<base::FilePath> GetModuleSearchPaths() {
   std::vector<base::FilePath> search_paths(2);
   PathService::Get(base::DIR_SOURCE_ROOT, &search_paths[0]);
   PathService::Get(base::DIR_EXE, &search_paths[1]);
   search_paths[1] = search_paths[1].AppendASCII("gen");
   return search_paths;
 }
 
+void StartCallback(base::WeakPtr<gin::Runner> runner,
+                   MojoHandle pipe,
+                   v8::Handle<v8::Value> module) {
+  if (!runner) {

[Aaron Boodman, 2013/11/27 19:02:41]

Can we really get here with runner not populated? I think that the callback
won't run if runner has been destroyed.

[abarth-chromium, 2013/11/27 19:18:09]

Removed.

+    CHECK(MojoClose(pipe) == MOJO_RESULT_OK);
+    return;
+  }
+  v8::Isolate* isolate = runner->isolate();
+  v8::Handle<v8::Function> start;
+  if (!gin::ConvertFromV8(module, &start)) {

[Aaron Boodman, 2013/11/27 19:02:41]

What would cause this to fail? I think it should just be
CHECK(gin::ConvertFromV8...)

[abarth-chromium, 2013/11/27 19:18:09]

This can fail if the requested module returns an object rather than a function. 
For example, if main.js returned {} instead of returning function(handle) {...}

[Aaron Boodman, 2013/11/27 20:35:49]

But we control main.js. It seems like if this ever happens it is a Mojo
programmer error.

+    CHECK(MojoClose(pipe) == MOJO_RESULT_OK);
+    return;
+  }
+  v8::Handle<v8::Value> args[] = { gin::ConvertToV8(isolate, pipe) };
+  runner->Call(start, runner->global(), 1, args);

[Aaron Boodman, 2013/11/27 19:02:41]

We should do a wrapper around calling JS functions. In the older version of the
gin library we had this. It's much easier :).

[abarth-chromium, 2013/11/27 19:18:09]

I bet!  :)

+}
+
 }  // namespace
 
 MojoRunnerDelegate::MojoRunnerDelegate()
     : ModuleRunnerDelegate(GetModuleSearchPaths()) {
-  AddBuiltinModule(Bootstrap::kModuleName, Bootstrap::GetTemplate);
+  AddBuiltinModule(Threading::kModuleName, Threading::GetTemplate);
   AddBuiltinModule(gin::Console::kModuleName, gin::Console::GetTemplate);
   AddBuiltinModule(js::Core::kModuleName, js::Core::GetTemplate);
   AddBuiltinModule(js::Support::kModuleName, js::Support::GetTemplate);
 }
 
 MojoRunnerDelegate::~MojoRunnerDelegate() {
 }
 
+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,
+                       base::Bind(StartCallback, runner->GetWeakPtr(), pipe));
+  AttemptToLoadMoreModules(runner);
+}
+
 void MojoRunnerDelegate::UnhandledException(gin::Runner* runner,
                                             gin::TryCatch& try_catch) {
   gin::ModuleRunnerDelegate::UnhandledException(runner, try_catch);
   LOG(ERROR) << try_catch.GetStackTrace();
 }
 
 }  // namespace apps
 }  // namespace mojo