WebUI: Move test_browser_proxy.js one level up.

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 20 matching lines @@
   /** @override */
   runAccessibilityChecks: false,
 
   /** @override */
   extraLibraries: [
     ROOT_PATH + 'third_party/mocha/mocha.js',
     ROOT_PATH + 'chrome/test/data/webui/mocha_adapter.js',
     ROOT_PATH + 'ui/webui/resources/js/promise_resolver.js',
     ROOT_PATH + 'ui/webui/resources/js/cr.js',
     ROOT_PATH + 'ui/webui/resources/js/util.js',
-    ROOT_PATH + 'chrome/test/data/webui/settings/test_browser_proxy.js',
+    ROOT_PATH + 'chrome/test/data/webui/test_browser_proxy.js',
   ],
 
   preLoad: function() {
     // A function that is called from chrome://bluetooth-internals to allow this
     // test to replace the real Mojo browser proxy with a fake one, before any
     // other code runs.
     window.setupFn = function() {
       return importModules([
         'content/public/renderer/frame_interfaces',
         'device/bluetooth/public/interfaces/adapter.mojom',
         'device/bluetooth/public/interfaces/device.mojom',
         'mojo/public/js/bindings',
       ]).then(function([frameInterfaces, adapter, device, bindings]) {
         /**
          * A test adapter factory proxy for the chrome://bluetooth-internals
          * page.
          *
          * @constructor
          * @extends {TestBrowserProxyBase}

[rbpotter, 2017/06/07 00:32:01]

Should probably be test.TestBrowserProxy. TestBrowserProxyBase is not
defined anywhere as far as I can tell (same thing elsewhere in this
file).

[dpapad, 2017/06/07 00:42:53]

Done.

          */
         var TestAdapterFactoryProxy = function() {
-          settings.TestBrowserProxy.call(this, [
+          test.TestBrowserProxy.call(this, [
             'getAdapter',
           ]);
 
           this.binding = new bindings.Binding(adapter.AdapterFactory, this);
           this.adapter = new TestAdapterProxy();
           this.adapterBinding_ = new bindings.Binding(adapter.Adapter,
                                                       this.adapter);
         };
 
         TestAdapterFactoryProxy.prototype = {
-          __proto__: settings.TestBrowserProxy.prototype,
+          __proto__: test.TestBrowserProxy.prototype,
           getAdapter: function() {
             this.methodCalled('getAdapter');
 
             // Create message pipe bound to TestAdapter.
             return Promise.resolve({
               adapter: this.adapterBinding_.createInterfacePtrAndBind(),
             });
           }
         };
 
         /**
          * A test adapter proxy for the chrome://bluetooth-internals page.
          * @constructor
          * @extends {TestBrowserProxyBase}
          */
         var TestAdapterProxy = function() {
-          settings.TestBrowserProxy.call(this, [
+          test.TestBrowserProxy.call(this, [
             'getInfo',
             'getDevices',
             'setClient',
           ]);
 
           this.deviceProxyMap = new Map();
           this.adapterInfo_ = null;
           this.devices_ = [];
           this.connectResult_ = adapter.AdapterInfo.SUCCESS;
         };
 
         TestAdapterProxy.prototype = {
-          __proto__: settings.TestBrowserProxy.prototype,
+          __proto__: test.TestBrowserProxy.prototype,
 
           connectToDevice: function(address) {
             assert(this.deviceProxyMap.has(address), 'Device does not exist');
 
             return Promise.resolve({
               result: this.connectResult_,
               device: this.deviceProxyMap.get(
                   address).binding.createInterfacePtrAndBind(),
             });
           },
@@ skipping 31 matching lines @@
 
         /**
          * A test Device proxy for the chrome://bluetooth-internals
          * page. Proxies are generated by a TestAdapterProxy which provides
          * the DeviceInfo.
          * @constructor
          * @extends {TestBrowserProxyBase}
          * @param {!device.DeviceInfo} info
          */
         var TestDeviceProxy = function(info) {
-          settings.TestBrowserProxy.call(this, [
+          test.TestBrowserProxy.call(this, [
             'getInfo',
             'getServices',
           ]);
 
           this.binding = new bindings.Binding(device.Device, this);
           this.info_ = info;
           this.services_ = [];
         }
 
         TestDeviceProxy.prototype = {
-          __proto__: settings.TestBrowserProxy.prototype,
+          __proto__: test.TestBrowserProxy.prototype,
 
           disconnect: function() {
             this.binding.close();
           },
 
           getInfo: function() {
             this.methodCalled('getInfo');
             return Promise.resolve({info: this.info_});
           },
 
@@ skipping 756 matching lines @@
     test('ValueControl_ConvertValue_Decimal_ThreeValues', function() {
       valueControl.typeSelect_.value = ValueDataType.DECIMAL
       valueControl.value_.setAs(ValueDataType.DECIMAL, '97-98-99' /* abc */);
       expectDeepEquals([aCode, bCode, cCode], valueControl.value_.getArray());
     });
   });
 
   // Run all registered tests.
   mocha.run();
 });