bluetooth: Clean up connection errors

content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.h

 // Copyright 2015 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.
 
 #ifndef CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_BLUETOOTH_ADAPTER_PROVIDER_H_
 #define CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_BLUETOOTH_ADAPTER_PROVIDER_H_
 
 #include <stdint.h>
 
 #include "base/callback.h"
@@ skipping 464 matching lines @@
   GetDelayedServicesDiscoveryAdapter();
 
   // |FailingConnectionsAdapter|
   // Inherits from |EmptyAdapter|
   // FailingConnectionsAdapter holds a device for each type of connection error
   // that can occur. This way we don’t need to create an adapter for each type
   // of error. Each of the devices has a service with a different UUID so that
   // they can be accessed by using different filters.
   // See connectErrorUUID() declaration below.
   // Internal Structure:
+  //  - UnconnectableDevice(BluetoothDevice::ERROR_AUTH_CANCELED)
+  //    connectErrorUUID(0x0)
+  //  - UnconnectableDevice(BluetoothDevice::ERROR_AUTH_FAILED)
+  //    connectErrorUUID(0x1)
+  //  - UnconnectableDevice(BluetoothDevice::ERROR_AUTH_REJECTED)
+  //    connectErrorUUID(0x2)
+  //  - UnconnectableDevice(BluetoothDevice::ERROR_AUTH_TIMEOUT)
+  //    connectErrorUUID(0x3)
+  //  - UnconnectableDevice(BluetoothDevice::ERROR_FAILED)
+  //    connectErrorUUID(0x4)
+  //  - UnconnectableDevice(BluetoothDevice::ERROR_INPROGRESS)
+  //    connectErrorUUID(0x5)
   //  - UnconnectableDevice(BluetoothDevice::ERROR_UNKNOWN)
-  //    connectErrorUUID(0x0)
-  //  - UnconnectableDevice(BluetoothDevice::ERROR_INPROGRESS)
-  //    connectErrorUUID(0x1)
-  //  - UnconnectableDevice(BluetoothDevice::ERROR_FAILED)
-  //    connectErrorUUID(0x2)
-  //  - UnconnectableDevice(BluetoothDevice::ERROR_AUTH_FAILED)
-  //    connectErrorUUID(0x3)
-  //  - UnconnectableDevice(BluetoothDevice::ERROR_AUTH_CANCELED)
-  //    connectErrorUUID(0x4)
-  //  - UnconnectableDevice(BluetoothDevice::ERROR_AUTH_REJECTED)
-  //    connectErrorUUID(0x5)
-  //  - UnconnectableDevice(BluetoothDevice::ERROR_AUTH_TIMEOUT)
   //    connectErrorUUID(0x6)
   //  - UnconnectableDevice(BluetoothDevice::ERROR_UNSUPPORTED_DEVICE)
   //    connectErrorUUID(0x7)
-  //  - UnconnectableDevice(BluetoothDevice::ERROR_ATTRIBUTE_LENGTH_INVALID)
-  //    connectErrorUUID(0x8)
-  //  - UnconnectableDevice(BluetoothDevice::ERROR_CONNECTION_CONGESTED)
-  //    connectErrorUUID(0x9)
-  //  - UnconnectableDevice(BluetoothDevice::ERROR_INSUFFICIENT_ENCRYPTION)
-  //    connectErrorUUID(0xa)
-  //  - UnconnectableDevice(BluetoothDevice::ERROR_OFFSET_INVALID)
-  //    connectErrorUUID(0xb)
-  //  - UnconnectableDevice(BluetoothDevice::ERROR_READ_NOT_PERMITTED)
-  //    connectErrorUUID(0xc)
-  //  - UnconnectableDevice(BluetoothDevice::ERROR_REQUEST_NOT_SUPPORTED)
-  //    connectErrorUUID(0xd)
-  //  - UnconnectableDevice(BluetoothDevice::ERROR_WRITE_NOT_PERMITTED)
-  //    connectErrorUUID(0xe)
   static scoped_refptr<testing::NiceMock<device::MockBluetoothAdapter>>
   GetFailingConnectionsAdapter();
 
   // |FailingGATTOperationsAdapter|
   // Inherits from |EmptyAdapter|
   // FailingGATTOperationsAdapter holds a device with one
   // service: ErrorsService. This service contains a characteristic for each
   // type of GATT Error that can be thrown. Trying to write or read from these
   // characteristics results in the corresponding error being returned.
   // GetProperties returns the following for all characteristics:
@@ skipping 316 matching lines @@
   //       Returns: true
   //   - Stop:
   //       Stops calling GattCharacteristicValueChanged and runs callback.
   static std::unique_ptr<
       testing::NiceMock<device::MockBluetoothGattNotifySession>>
   GetBaseGATTNotifySession(
       base::WeakPtr<device::BluetoothRemoteGattCharacteristic> characteristic);
 
   // Helper functions:
 
-  // DEPRECATED: This is a poor practice as it exposes the specific
-  //             enum values of this code base into the UUIDs used
-  //             by the test data. Prefer methods such as
-  //             connectErrorUUID.
   // errorUUID(alias) returns a UUID with the top 32 bits of

[scheib, 2017/03/07 06:20:22]

Why are we removing connectErrorUUID? I'll read further and perhaps find out --
but it was a much more stable way of referring to these UUIDs. (Though, I'm
looking forward to programatic tests fixing this and making it obsolete).

[ortuno, 2017/03/08 01:46:10]

There were actually no calls to connectErrorUUID D: so I just removed it. I
could change the fake adapter to use it instead but it seemed unnecessary since
as you said we are moving to programatic tests. I don't feel strongly about this
so happy to change if you think we should use connectErrorUUID.

[scheib, 2017/03/08 02:36:08]

OK, wonder where they went. ;) It was certainly a better pattern (stable IDs,
not needing to reshuffle tests and c++ in parallel). OK to drop it. Once we get
to upstreaming tests it won't be feasible to change IDs easily - so the current
pattern needs to die before that.

   // "00000000-97e5-4cd7-b9f1-f5a427670c59" replaced with the bits of |alias|.
   // For example, errorUUID(0xDEADBEEF) returns
   // "deadbeef-97e5-4cd7-b9f1-f5a427670c59". The bottom 96 bits of error UUIDs
   // were generated as a type 4 (random) UUID.
   static std::string errorUUID(uint32_t alias);
 
-  // Returns a stable test data UUID associated with a given
-  // BluetoothDevice::ConnectErrorCode.
-  static device::BluetoothUUID connectErrorUUID(
-      device::BluetoothDevice::ConnectErrorCode error_code);
-
   // Function to turn an integer into an MAC address of the form
   // XX:XX:XX:XX:XX:XX. For example makeMACAddress(0xdeadbeef)
   // returns "00:00:DE:AD:BE:EF".
   static std::string makeMACAddress(uint64_t addr);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_BLUETOOTH_ADAPTER_PROVIDER_H_