BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

2 files changed, 59 insertions, 47 deletions

diff --git a/chromium/third_party/closure_compiler/interfaces/bluetooth_interface.js b/chromium/third_party/closure_compiler/interfaces/bluetooth_interface.js
index 992665fa54f..81c348bbb4b 100644
--- a/chromium/third_party/closure_compiler/interfaces/bluetooth_interface.js
+++ b/chromium/third_party/closure_compiler/interfaces/bluetooth_interface.js
@@ -1,48 +1,46 @@
-// Copyright 2018 The Chromium Authors. All rights reserved.
+// Copyright 2020 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.
 
 // This file was generated by:
-//   tools/json_schema_compiler/compiler.py.
+//   ./tools/json_schema_compiler/compiler.py.
 
 /** @fileoverview Interface for bluetooth that can be overriden. */
 
-assertNotReached('Interface file for Closure Compiler should not be executed.');
-
 /** @interface */
 function Bluetooth() {}
 
 Bluetooth.prototype = {
   /**
    * Get information about the Bluetooth adapter.
-   * @param {function(!chrome.bluetooth.AdapterState):void} callback Called with
-   *     an AdapterState object describing the adapter state.
+   * @param {function(!chrome.bluetooth.AdapterState): void} callback Called
+   *     with an AdapterState object describing the adapter state.
    * @see https://developer.chrome.com/extensions/bluetooth#method-getAdapterState
    */
-  getAdapterState: assertNotReached,
+  getAdapterState: function(callback) {},
 
   /**
    * Get information about a Bluetooth device known to the system.
    * @param {string} deviceAddress Address of device to get.
-   * @param {function(!chrome.bluetooth.Device):void} callback Called with the
+   * @param {function(!chrome.bluetooth.Device): void} callback Called with the
    *     Device object describing the device.
    * @see https://developer.chrome.com/extensions/bluetooth#method-getDevice
    */
-  getDevice: assertNotReached,
+  getDevice: function(deviceAddress, callback) {},
 
   /**
    * Get a list of Bluetooth devices known to the system, including paired and
    * recently discovered devices.
-   * @param {!chrome.bluetooth.BluetoothFilter=} filter Some criteria to filter
-   *     the list of returned bluetooth devices. If the filter is not set or set
-   *     to <code>{}</code>, returned device list will contain all bluetooth
-   *     devices. Right now this is only supported in ChromeOS, for other
-   *     platforms, a full list is returned.
-   * @param {function(!Array<!chrome.bluetooth.Device>):void=} callback Called
+   * @param {?chrome.bluetooth.BluetoothFilter|undefined} filter Some criteria
+   *     to filter the list of returned bluetooth devices. If the filter is not
+   *     set or set to <code>{}</code>, returned device list will contain all
+   *     bluetooth devices. Right now this is only supported in ChromeOS, for
+   *     other platforms, a full list is returned.
+   * @param {function(!Array<!chrome.bluetooth.Device>): void} callback Called
    *     when the search is completed.
    * @see https://developer.chrome.com/extensions/bluetooth#method-getDevices
    */
-  getDevices: assertNotReached,
+  getDevices: function(filter, callback) {},
 
   /**
    * <p>Start discovery. Newly discovered devices will be returned via the
@@ -52,17 +50,17 @@ Bluetooth.prototype = {
    * changes.</p><p>Discovery will fail to start if this application has already
    * called startDiscovery.  Discovery can be resource intensive: stopDiscovery
    * should be called as soon as possible.</p>
-   * @param {function():void=} callback Called to indicate success or failure.
+   * @param {function(): void=} callback Called to indicate success or failure.
    * @see https://developer.chrome.com/extensions/bluetooth#method-startDiscovery
    */
-  startDiscovery: assertNotReached,
+  startDiscovery: function(callback) {},
 
   /**
    * Stop discovery.
-   * @param {function():void=} callback Called to indicate success or failure.
+   * @param {function(): void=} callback Called to indicate success or failure.
    * @see https://developer.chrome.com/extensions/bluetooth#method-stopDiscovery
    */
-  stopDiscovery: assertNotReached,
+  stopDiscovery: function(callback) {},
 };
 
 /**
diff --git a/chromium/third_party/closure_compiler/interfaces/bluetooth_private_interface.js b/chromium/third_party/closure_compiler/interfaces/bluetooth_private_interface.js
index 744a57be709..2399ca0c821 100644
--- a/chromium/third_party/closure_compiler/interfaces/bluetooth_private_interface.js
+++ b/chromium/third_party/closure_compiler/interfaces/bluetooth_private_interface.js
@@ -1,4 +1,4 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
+// Copyright 2020 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.
 
@@ -7,81 +7,95 @@
 
 /** @fileoverview Interface for bluetoothPrivate that can be overriden. */
 
-assertNotReached('Interface file for Closure Compiler should not be executed.');
-
 /** @interface */
 function BluetoothPrivate() {}
 
 BluetoothPrivate.prototype = {
   /**
    * Changes the state of the Bluetooth adapter.
-   * @param {!chrome.bluetoothPrivate.NewAdapterState} adapterState
-   * @param {function():void=} callback
-   * @see https://developer.chrome.com/extensions/bluetoothPrivate#method-setAdapterState
+   * @param {!chrome.bluetoothPrivate.NewAdapterState} adapterState The new
+   *     state of the adapter.
+   * @param {function(): void=} callback Called when all the state changes have
+   *     been completed.
    */
-  setAdapterState: assertNotReached,
+  setAdapterState: function(adapterState, callback) {},
 
   /**
    * @param {!chrome.bluetoothPrivate.SetPairingResponseOptions} options
-   * @param {function():void=} callback
-   * @see https://developer.chrome.com/extensions/bluetoothPrivate#method-setPairingResponse
+   * @param {function(): void=} callback
    */
-  setPairingResponse: assertNotReached,
+  setPairingResponse: function(options, callback) {},
 
   /**
    * Tears down all connections to the given device.
    * @param {string} deviceAddress
-   * @param {function():void=} callback
-   * @see https://developer.chrome.com/extensions/bluetoothPrivate#method-disconnectAll
+   * @param {function(): void=} callback
    */
-  disconnectAll: assertNotReached,
+  disconnectAll: function(deviceAddress, callback) {},
 
   /**
    * Forgets the given device.
    * @param {string} deviceAddress
-   * @param {function():void=} callback
-   * @see https://developer.chrome.com/extensions/bluetoothPrivate#method-forgetDevice
+   * @param {function(): void=} callback
    */
-  forgetDevice: assertNotReached,
+  forgetDevice: function(deviceAddress, callback) {},
 
   /**
    * Set or clear discovery filter.
    * @param {!chrome.bluetoothPrivate.DiscoveryFilter} discoveryFilter
-   * @param {function():void=} callback
-   * @see https://developer.chrome.com/extensions/bluetoothPrivate#method-setDiscoveryFilter
+   * @param {function(): void=} callback
    */
-  setDiscoveryFilter: assertNotReached,
+  setDiscoveryFilter: function(discoveryFilter, callback) {},
 
   /**
    * Connects to the given device. This will only throw an error if the device
    * address is invalid or the device is already connected. Otherwise this will
    * succeed and invoke |callback| with ConnectResultType.
    * @param {string} deviceAddress
-   * @param {function(!chrome.bluetoothPrivate.ConnectResultType):void=}
+   * @param {function(!chrome.bluetoothPrivate.ConnectResultType): void=}
    *     callback
-   * @see https://developer.chrome.com/extensions/bluetoothPrivate#method-connect
    */
-  connect: assertNotReached,
+  connect: function(deviceAddress, callback) {},
 
   /**
    * Pairs the given device.
    * @param {string} deviceAddress
-   * @param {function():void=} callback
-   * @see https://developer.chrome.com/extensions/bluetoothPrivate#method-pair
+   * @param {function(): void=} callback
+   */
+  pair: function(deviceAddress, callback) {},
+
+  /**
+   * Record that a pairing attempt finished. Ignores cancellations.
+   * @param {!chrome.bluetoothPrivate.TransportType} transport
+   * @param {number} pairingDurationMs
+   * @param {!chrome.bluetoothPrivate.ConnectResultType=} result
+   */
+  recordPairing: function(transport, pairingDurationMs, result) {},
+
+  /**
+   * Record that a user-initiated reconnection attempt to an already paired
+   * device finished. Ignores cancellations.
+   * @param {!chrome.bluetoothPrivate.ConnectResultType=} result
+   */
+  recordReconnection: function(result) {},
+
+  /**
+   * Record that a user selected a device to connect to.
+   * @param {number} selectionDurationMs
+   * @param {boolean} wasPaired
+   * @param {!chrome.bluetoothPrivate.TransportType} transport
    */
-  pair: assertNotReached,
+  recordDeviceSelection: function(selectionDurationMs, wasPaired, transport) {},
 };
 
 /**
  * Fired when a pairing event occurs.
  * @type {!ChromeEvent}
- * @see https://developer.chrome.com/extensions/bluetoothPrivate#event-onPairing
  */
 BluetoothPrivate.prototype.onPairing;
 
 /**
  * Fired when a Bluetooth device changed its address.
  * @type {!ChromeEvent}
- * @see https://developer.chrome.com/extensions/bluetoothPrivate#event-onDeviceAddressChanged
  */
 BluetoothPrivate.prototype.onDeviceAddressChanged;