Mojo JS Bindings: Simplify sharing services for content-provided JS applications

mojo/apps/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 "mojo/apps/js/js_app.h"
 
 #include "base/bind.h"
 #include "gin/array_buffer.h"
 #include "gin/converter.h"
 #include "mojo/apps/js/application_delegate_impl.h"
@@ skipping 30 matching lines @@
 
 void JSApp::Quit() {
   CHECK(on_js_app_thread());
 
   // The terminate operation is posted to the message_loop so that
   // the shell_runner isn't destroyed before this JS function returns.
   thread_.message_loop()->PostTask(
       FROM_HERE, base::Bind(&JSApp::Terminate, base::Unretained(this)));
 }
 
-Handle JSApp::ConnectToService(const std::string& application_url,
-                               const std::string& interface_name) {
+MessagePipeHandle JSApp::ConnectToApplication(
+    const std::string& application_url) {
   CHECK(on_js_app_thread());
   MessagePipe pipe;
+  InterfaceRequest<ServiceProvider> request =
+      MakeRequest<ServiceProvider>(pipe.handle1.Pass());
 
   app_delegate_impl_task_runner_->PostTask(
       FROM_HERE,
-      base::Bind(&ApplicationDelegateImpl::ConnectToService,
+      base::Bind(&ApplicationDelegateImpl::ConnectToApplication,
                  base::Unretained(app_delegate_impl_),
-                 base::Passed(pipe.handle1.Pass()),
                  application_url,
-                 interface_name));
+                 base::Passed(request.Pass())));
 
-  return pipe.handle0.release();
+  return pipe.handle0.Pass().release();
 }
 
+
 void JSApp::Run() {
   CHECK(!js_app_task_runner_.get() && !on_app_delegate_impl_thread());
   js_app_task_runner_ = base::MessageLoop::current()->task_runner();
 
   std::string source;
   std::string file_name;
   Load(&source, &file_name);  // TODO(hansmuller): handle Load() failure.
 
   isolate_holder_.reset(new gin::IsolateHolder());
   isolate_holder_->AddRunMicrotasksObserver();
@@ skipping 26 matching lines @@
 }
 
 bool JSApp::on_js_app_thread() const {
   return js_app_task_runner_.get() &&
          js_app_task_runner_.get() ==
              base::MessageLoop::current()->task_runner().get();
 }
 
 }  // namespace apps
 }  // namespace mojo