bluetooth: Update internals page browser test fixture.

chrome/test/data/webui/bluetooth_internals_browsertest.js

 // Copyright 2016 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.
 
 /**
  * @fileoverview Tests for chrome://bluetooth-internals
  */
 
 /** @const {string} Path to source root. */
 var ROOT_PATH = '../../../../';
@@ skipping 47 matching lines @@
           *
           * @constructor
           * @extends {TestBrowserProxyBase}
           */
         var TestAdapterFactoryProxy = function() {
           settings.TestBrowserProxy.call(this, [
             'getAdapter',
           ]);
 
           this.binding = new bindings.Binding(adapter.AdapterFactory, this);
-          this.adapter = new TestAdapter();
+          this.adapter = new TestAdapterProxy();
           this.adapterBinding_ = new bindings.Binding(adapter.Adapter,
                                                       this.adapter);
         };
 
         TestAdapterFactoryProxy.prototype = {
           __proto__: settings.TestBrowserProxy.prototype,
           getAdapter: function() {
             this.methodCalled('getAdapter');
 
             // Create message pipe bound to TestAdapter.
             return Promise.resolve({
               adapter: this.adapterBinding_.createInterfacePtrAndBind(),
             });
           }
         };
 
         /**
-          * A test adapter for the chrome://bluetooth-internals page.
-          * Must be used to create message pipe handle from test code.
-          *
-          * @constructor
-          */
-        var TestAdapter = function() {
-          this.proxy = new TestAdapterProxy();
-        };
-
-        TestAdapter.prototype = {
-          getInfo: function() { return this.proxy.getInfo(); },
-          getDevices: function() { return this.proxy.getDevices(); },
-          setClient: function(client) { return this.proxy.setClient(client); }
-        };
-
-        /**
           * A test adapter proxy for the chrome://bluetooth-internals page.
           *
           * @constructor
           * @extends {TestBrowserProxyBase}
           */
         var TestAdapterProxy = function() {
           settings.TestBrowserProxy.call(this, [
             'getInfo',
             'getDevices',
             'setClient',
@@ skipping 27 matching lines @@
           setTestDevices: function(devices) {
             this.devices_ = devices;
           }
         };
 
         frameInterfaces.addInterfaceOverrideForTesting(
             adapter.AdapterFactory.name, function(handle) {
               this.adapterFactory = new TestAdapterFactoryProxy();
               this.adapterFactory.binding.bind(handle);
 
-              this.adapterFactory.adapter.proxy.setTestDevices([
+              this.adapterFactory.adapter.setTestDevices([
                 this.fakeDeviceInfo1(),
                 this.fakeDeviceInfo2(),
               ]);
-              this.adapterFactory.adapter.proxy.setTestAdapter(
+              this.adapterFactory.adapter.setTestAdapter(
                   this.fakeAdapterInfo());
 
               this.setupResolver.resolve();
             }.bind(this));
 
       }.bind(this));
     }.bind(this);
   },
 
   /**
@@ skipping 68 matching lines @@
     adapterFactory = this.adapterFactory;
   }.bind(this));
 
   suite('BluetoothInternalsUITest', function() {
     var EXPECTED_DEVICES = 2;
 
     suiteSetup(function() {
       return setupPromise.then(function() {
         return Promise.all([
           adapterFactory.whenCalled('getAdapter'),
-          adapterFactory.adapter.proxy.whenCalled('getInfo'),
-          adapterFactory.adapter.proxy.whenCalled('getDevices'),
-          adapterFactory.adapter.proxy.whenCalled('setClient'),
+          adapterFactory.adapter.whenCalled('getInfo'),
+          adapterFactory.adapter.whenCalled('getDevices'),
+          adapterFactory.adapter.whenCalled('setClient'),
         ]);
       });
     });
 
     setup(function() {
       deviceTable = document.querySelector('#devices table');
       sidebarNode = document.querySelector('#sidebar');
       devices.splice(0, devices.length);
       adapterBroker.adapterClient_.deviceAdded(fakeDeviceInfo1());
       adapterBroker.adapterClient_.deviceAdded(fakeDeviceInfo2());
@@ skipping 305 matching lines @@
         expectEquals(0, snackbar.Snackbar.queue_.length);
         expectFalse(!!snackbar.Snackbar.current_);
       }).then(finishSnackbarTest);
     });
   });
 
 
   // Run all registered tests.
   mocha.run();
 });