Mojo JS bindings: simplify mojo.connectToService() usage - Part 1

content/test/data/web_ui_mojo.js

Index: content/test/data/web_ui_mojo.js
diff --git a/content/test/data/web_ui_mojo.js b/content/test/data/web_ui_mojo.js
index 7289c665c16630a6aa2ed8ed1349ab97eb28b94b..cac2eb7a3c72dea0a193c408bad24a993a481f8c 100644
--- a/content/test/data/web_ui_mojo.js
+++ b/content/test/data/web_ui_mojo.js
@@ -18,7 +18,7 @@ define('main', [
   // the client side of the interface. Since JS is loosely typed, we do not need
   // a separate base class to inherit from to receive callbacks.
   RendererTargetTest.prototype =
-      Object.create(bindings.RendererTargetStub.prototype);
+      Object.create(bindings.RendererTarget.stubClass.prototype);
 
   RendererTargetTest.prototype.ping = function () {
     this.bindings_.pingResponse();
@@ -26,9 +26,8 @@ define('main', [
 
   return function() {
     retainedConnection = new connection.Connection(
-        // TODO(sammc): Avoid using NAME_ directly.
-        serviceProvider.connectToService(bindings.BrowserTargetProxy.NAME_),
+        serviceProvider.connectToService(bindings.BrowserTarget.name),
         RendererTargetTest,
-        bindings.BrowserTargetProxy);
+        bindings.BrowserTarget.proxyClass);
   };
 });