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

mojo/apps/js/bindings/sample_service_unittests.js

 // Copyright 2013 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.
 
 define([
     "console",
     "mojo/apps/js/test/hexdump",
     "gin/test/expect",
     "mojo/public/interfaces/bindings/tests/sample_service.mojom",
     "mojo/public/interfaces/bindings/tests/sample_import.mojom",
@@ skipping 115 matching lines @@
     expect(defaults.a22.color).toBe(imported2.Color.BLACK);
     expect(defaults.a21).toBeNull();
     expect(defaults.a23).toBe(0xFFFFFFFFFFFFFFFF);
     expect(defaults.a24).toBe(0x123456789);
     expect(defaults.a25).toBe(-0x123456789);
   }
 
   function ServiceImpl() {
   }
 
-  ServiceImpl.prototype = Object.create(sample.ServiceStub.prototype);
+  ServiceImpl.prototype = Object.create(sample.Service.stubClass.prototype);
 
   ServiceImpl.prototype.frobinate = function(foo, baz, port) {
     checkFoo(foo);
-    expect(baz).toBe(sample.ServiceStub.BazOptions.EXTRA);
+    expect(baz).toBe(sample.Service.stubClass.BazOptions.EXTRA);
     expect(port).toBe(10);
     global.result = "PASS";
   };
 
   function SimpleMessageReceiver() {
   }
 
   SimpleMessageReceiver.prototype.accept = function(message) {
     if (dumpMessageAsHex) {
       var uint8Array = new Uint8Array(message.buffer.arrayBuffer);
       console.log(hexdump.dumpArray(uint8Array));
     }
     // Imagine some IPC happened here.
     var serviceImpl = new ServiceImpl();
     serviceImpl.accept(message);
   };
 
   var receiver = new SimpleMessageReceiver();
-  var serviceProxy = new sample.ServiceProxy(receiver);
+  var serviceProxy = new sample.Service.proxyClass(receiver);
 
   checkDefaultValues();
 
   var foo = makeFoo();
   checkFoo(foo);
 
   var port = 10;
-  serviceProxy.frobinate(foo, sample.ServiceProxy.BazOptions.EXTRA, port);
+  serviceProxy.frobinate(foo, sample.Service.proxyClass.BazOptions.EXTRA, port);
 });