Add a Javascript wrapper around ServiceRegistry and expose it to WebUI.

content/renderer/web_ui_mojo_context_state.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 "content/renderer/web_ui_mojo_context_state.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "content/public/renderer/resource_fetcher.h"
 #include "content/renderer/web_ui_runner.h"
@@ skipping 18 matching lines @@
 
 namespace content {
 
 namespace {
 
 // All modules have this prefixed to them when downloading.
 // TODO(sky): move this into some common place.
 const char kModulePrefix[] = "chrome://mojo/";
 
 void RunMain(base::WeakPtr<gin::Runner> runner,
-             mojo::ScopedMessagePipeHandle* handle,
              v8::Handle<v8::Value> module) {
   v8::Isolate* isolate = runner->GetContextHolder()->isolate();
   v8::Handle<v8::Function> start;
   CHECK(gin::ConvertFromV8(isolate, module, &start));
-  v8::Handle<v8::Value> args[] = {
-      gin::ConvertToV8(isolate, mojo::Handle(handle->release().value())) };
-  runner->Call(start, runner->global(), 1, args);
+  runner->Call(start, runner->global(), 0, NULL);
 }
 
 }  // namespace
 
 // WebUIMojo -------------------------------------------------------------------
 
 WebUIMojoContextState::WebUIMojoContextState(blink::WebFrame* frame,
                                              v8::Handle<v8::Context> context)
     : frame_(frame),
       module_added_(false) {
   gin::PerContextData* context_data = gin::PerContextData::From(context);
   gin::ContextHolder* context_holder = context_data->context_holder();
   runner_.reset(new WebUIRunner(frame_, context_holder));
   gin::Runner::Scope scoper(runner_.get());
   gin::ModuleRegistry::From(context)->AddObserver(this);
   runner_->RegisterBuiltinModules();
   gin::ModuleRegistry::InstallGlobals(context->GetIsolate(), context->Global());
   // Warning |frame| may be destroyed.
   // TODO(sky): add test for this.
 }
 
 WebUIMojoContextState::~WebUIMojoContextState() {
   gin::Runner::Scope scoper(runner_.get());
   gin::ModuleRegistry::From(
       runner_->GetContextHolder()->context())->RemoveObserver(this);
 }
 
-void WebUIMojoContextState::SetHandle(mojo::ScopedMessagePipeHandle handle) {
+void WebUIMojoContextState::Run() {
   gin::ContextHolder* context_holder = runner_->GetContextHolder();
-  mojo::ScopedMessagePipeHandle* passed_handle =
-      new mojo::ScopedMessagePipeHandle(handle.Pass());
-  gin::ModuleRegistry::From(context_holder->context())->LoadModule(
-      context_holder->isolate(),
-      "main",
-      base::Bind(RunMain, runner_->GetWeakPtr(), base::Owned(passed_handle)));
+  gin::ModuleRegistry::From(context_holder->context())
+      ->LoadModule(context_holder->isolate(),

[darin (slow to review), 2014/06/21 04:44:16]

ditto

[Sam McNally, 2014/06/24 08:45:01]

Done.

+                   "main",
+                   base::Bind(RunMain, runner_->GetWeakPtr()));
 }
 
 void WebUIMojoContextState::FetchModules(const std::vector<std::string>& ids) {
   gin::Runner::Scope scoper(runner_.get());
   gin::ContextHolder* context_holder = runner_->GetContextHolder();
   gin::ModuleRegistry* registry = gin::ModuleRegistry::From(
       context_holder->context());
   for (size_t i = 0; i < ids.size(); ++i) {
     if (fetched_modules_.find(ids[i]) == fetched_modules_.end() &&
         registry->available_modules().count(ids[i]) == 0) {
@@ skipping 41 matching lines @@
     const std::vector<std::string>& dependencies) {
   FetchModules(dependencies);
 
   gin::ContextHolder* context_holder = runner_->GetContextHolder();
   gin::ModuleRegistry* registry = gin::ModuleRegistry::From(
       context_holder->context());
   registry->AttemptToLoadMoreModules(context_holder->isolate());
 }
 
 }  // namespace content