From acdacb92141365fa8d240e27df9aa4641c6fdf70 Mon Sep 17 00:00:00 2001
From: Hans Muller <hansmuller@chromium.org>
Date: Wed, 28 Jan 2015 11:27:33 -0800
Subject: [PATCH] Upgrade Sky's use of the JS bindings

BUG=
R=abarth@chromium.org

Review URL: https://codereview.chromium.org/875713003
---
 framework/embedder.sky       | 8 ++++----
 framework/shell.sky          | 8 +-------
 framework/xmlhttprequest.sky | 7 +++----
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/framework/embedder.sky b/framework/embedder.sky
index 742b7fa2ba5..202967c95bc 100644
--- a/framework/embedder.sky
+++ b/framework/embedder.sky
@@ -1,8 +1,8 @@
-<import src="shell.sky" as="shell" />
+<import src="/gen/mojo/public/sky/connection.sky" as="connection" />
 <script>
-function connectToEmbedderService(service, client) {
-    var handle = internals.connectToEmbedderService(service.name);
-    return shell.wrapHandle(handle, service, client);
+function connectToEmbedderService(service) {
+  var handle = internals.connectToEmbedderService(service.name);
+  return connection.bindHandleToProxy(handle, service);
 }
 
 module.exports = {
diff --git a/framework/shell.sky b/framework/shell.sky
index b23b470d4fe..1e6c8690fe7 100644
--- a/framework/shell.sky
+++ b/framework/shell.sky
@@ -1,17 +1,11 @@
-<import src="/gen/mojo/public/sky/core.sky" as="core" />
 <import src="/gen/mojo/public/sky/connection.sky" as="connection" />
 <script>
-function wrapHandle(handle, service, client) {
-  return connection.bindProxyHandle(handle, service.client, service);
-}
-
 function connectToService(url, service, client) {
   var handle = internals.connectToService(url, service.name);
-  return wrapHandle(handle, service, client);
+  return connection.bindHandleToProxy(handle, service);
 }
 
 module.exports = {
   connectToService: connectToService,
-  wrapHandle: wrapHandle,
 };
 </script>
diff --git a/framework/xmlhttprequest.sky b/framework/xmlhttprequest.sky
index ef132650cad..7df72b17532 100644
--- a/framework/xmlhttprequest.sky
+++ b/framework/xmlhttprequest.sky
@@ -101,10 +101,9 @@ class XMLHttpRequest {
     });
     priv.request.headers = requestHeaders;
 
-    // FIXME: Factor this into the JS bindings.
-    var pipe = new core.createMessagePipe();
-    priv.networkService.createURLLoader(pipe.handle1);
-    priv.loader = shell.wrapHandle(pipe.handle0, loader.URLLoader);
+    priv.networkService.createURLLoader(function(urlLoaderProxy) {
+        priv.loader = urlLoaderProxy;
+    });
 
     var self = this;
     outstandingRequests.add(this);