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

services/js/js_app.cc

Index: services/js/js_app.cc
diff --git a/services/js/js_app.cc b/services/js/js_app.cc
index af17009d15c31cc0db3b01f9778770332db29f19..8b9690182905a5ae7ff6c12b88869298ea48ac3d 100644
--- a/services/js/js_app.cc
+++ b/services/js/js_app.cc
@@ -14,9 +14,9 @@
 #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 {
@@ -89,6 +89,9 @@ JSApp::JSApp(ShellPtr shell, URLResponsePtr response) : shell_(shell.Pass()) {
   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);
@@ -165,7 +168,7 @@ void JSApp::AcceptConnection(const String& requestor_url,
   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);
 }