Mojo JS Bindings: restore the ServiceProvider class, add an application test

services/js/js_app.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 "services/js/js_app.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "gin/converter.h"
 #include "gin/modules/module_registry.h"
 #include "gin/try_catch.h"
 #include "mojo/common/data_pipe_utils.h"
 #include "mojo/edk/js/core.h"
 #include "mojo/edk/js/handle.h"
 #include "mojo/edk/js/support.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
+#include "services/js/js_app_bridge_module.h"
 #include "services/js/js_app_message_loop_observers.h"
 #include "services/js/js_app_shell.h"
-#include "services/js/mojo_bridge_module.h"
 
 namespace mojo {
 namespace js {
 
 namespace {
 
 // If true then result is the value of value.property_name.
 bool GetValueProperty(v8::Isolate* isolate,
                       v8::Handle<v8::Value> value,
                       const std::string& property_name,
@@ skipping 52 matching lines @@
 
 JSApp::JSApp(ShellPtr shell, URLResponsePtr response) : shell_(shell.Pass()) {
   v8::Isolate* isolate = isolate_holder_.isolate();
   message_loop_observers_.reset(new JSAppMessageLoopObservers(isolate));
 
   DCHECK(!response.is_null());
   std::string url(response->url);
   std::string source;
   CHECK(common::BlockingCopyToString(response->body.Pass(), &source));
 
+  runner_delegate_.AddBuiltinModule(AppBridge::kModuleName,
+      base::Bind(&AppBridge::GetModule, base::Unretained(this)));
+
   shell_runner_.reset(new gin::ShellRunner(&runner_delegate_, isolate));
   gin::Runner::Scope scope(shell_runner_.get());
   shell_runner_->Run(source.c_str(), kMainModuleName);
 
   gin::ModuleRegistry* registry =
       gin::ModuleRegistry::From(shell_runner_->GetContextHolder()->context());
   registry->LoadModule(
       isolate,
       kMainModuleName,
       base::Bind(&JSApp::OnAppLoaded, base::Unretained(this), url));
@@ skipping 56 matching lines @@
   };
   CallAppInstanceMethod("initialize", 1, argv);
 }
 
 void JSApp::AcceptConnection(const String& requestor_url,
                              ServiceProviderPtr provider) {
   gin::Runner::Scope scope(shell_runner_.get());
   v8::Isolate* isolate = isolate_holder_.isolate();
   v8::Handle<v8::Value> argv[] = {
     gin::ConvertToV8(isolate, requestor_url.To<std::string>()),
-    gin::ConvertToV8(isolate, provider.PassMessagePipe().get()),
+    gin::ConvertToV8(isolate, provider.PassMessagePipe().release()),
   };
   CallAppInstanceMethod("acceptConnection", arraysize(argv), argv);
 }
 
 void JSApp::Quit() {
   base::MessageLoop::current()->PostTask(
       FROM_HERE, base::Bind(&JSApp::QuitInternal, base::Unretained(this)));
 }
 
 void JSApp::QuitInternal() {
   shell_runner_.reset();
   base::MessageLoop::current()->QuitWhenIdle();
 }
 
 }  // namespace js
 }  // namespace mojo