Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Unified Diff: content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc

Issue 1464443002: bluetooth: android: Add BluetoothDevice::ConnectErrorCode enums (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: VI Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc
diff --git a/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc b/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc
index b41b92f80eeaa92eff7a00920129a8dc9ae6fa28..46e7ec575a259ac448473d4c9bcedd039c3b3941 100644
--- a/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc
+++ b/content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc
@@ -488,8 +488,8 @@ scoped_refptr<NiceMockBluetoothAdapter>
LayoutTestBluetoothAdapterProvider::GetFailingConnectionsAdapter() {
scoped_refptr<NiceMockBluetoothAdapter> adapter(GetEmptyAdapter());
- for (int error = BluetoothDevice::ERROR_UNKNOWN;
- error <= BluetoothDevice::ERROR_UNSUPPORTED_DEVICE; error++) {
+ for (int error = 0; error < BluetoothDevice::NUM_CONNECT_ERROR_CODES;
+ error++) {
adapter->AddMockDevice(GetUnconnectableDevice(
adapter.get(), static_cast<BluetoothDevice::ConnectErrorCode>(error)));
}
@@ -832,6 +832,51 @@ std::string LayoutTestBluetoothAdapterProvider::errorUUID(uint32_t alias) {
}
// static
+BluetoothUUID LayoutTestBluetoothAdapterProvider::connectErrorUUID(
+ BluetoothDevice::ConnectErrorCode error_code) {
+ // Case values listed in alphabetical order.
+ // Associated UUIDs are defined in layout tests and should remain stable
+ // even if BluetoothDevice enum values change.
+ switch (error_code) {
+ case BluetoothDevice::ERROR_ATTRIBUTE_LENGTH_INVALID:
+ return BluetoothUUID("0008");
+ case BluetoothDevice::ERROR_AUTH_CANCELED:
+ return BluetoothUUID("0004");
+ case BluetoothDevice::ERROR_AUTH_FAILED:
+ return BluetoothUUID("0003");
+ case BluetoothDevice::ERROR_AUTH_REJECTED:
+ return BluetoothUUID("0005");
+ case BluetoothDevice::ERROR_AUTH_TIMEOUT:
+ return BluetoothUUID("0006");
+ case BluetoothDevice::ERROR_CONNECTION_CONGESTED:
+ return BluetoothUUID("0009");
+ case BluetoothDevice::ERROR_FAILED:
+ return BluetoothUUID("0002");
+ case BluetoothDevice::ERROR_INPROGRESS:
+ return BluetoothUUID("0001");
+ case BluetoothDevice::ERROR_INSUFFICIENT_ENCRYPTION:
+ return BluetoothUUID("000a");
+ case BluetoothDevice::ERROR_OFFSET_INVALID:
+ return BluetoothUUID("000b");
+ case BluetoothDevice::ERROR_READ_NOT_PERMITTED:
+ return BluetoothUUID("000c");
+ case BluetoothDevice::ERROR_REQUEST_NOT_SUPPORTED:
+ return BluetoothUUID("000d");
+ case BluetoothDevice::ERROR_UNKNOWN:
+ return BluetoothUUID("0000");
+ case BluetoothDevice::ERROR_UNSUPPORTED_DEVICE:
+ return BluetoothUUID("0007");
+ case BluetoothDevice::ERROR_WRITE_NOT_PERMITTED:
+ return BluetoothUUID("000e");
+ case BluetoothDevice::NUM_CONNECT_ERROR_CODES:
+ NOTREACHED();
+ return BluetoothUUID();
+ }
+ NOTREACHED();
+ return BluetoothUUID();
+}
+
+// static
std::string LayoutTestBluetoothAdapterProvider::makeMACAddress(uint64_t addr) {
return BluetoothDevice::CanonicalizeAddress(
base::StringPrintf("%012" PRIx64, addr));

Powered by Google App Engine
This is Rietveld 408576698