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 72991bf6f7748330f49ff3d640429eef1ac68692..25ade53982c66085f1e1be291952a564e8592775 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 |
@@ -186,18 +186,12 @@ LayoutTestBluetoothAdapterProvider::GetBluetoothAdapter( |
return GetFailStartDiscoveryAdapter(); |
if (fake_adapter_name == "GlucoseHeartRateAdapter") |
return GetGlucoseHeartRateAdapter(); |
- if (fake_adapter_name == "UnicodeDeviceAdapter") |
- return GetUnicodeDeviceAdapter(); |
- if (fake_adapter_name == "DeviceNameLongerThan29BytesAdapter") |
- return GetDeviceNameLongerThan29BytesAdapter(); |
if (fake_adapter_name == "MissingServiceHeartRateAdapter") |
return GetMissingServiceHeartRateAdapter(); |
if (fake_adapter_name == "MissingCharacteristicHeartRateAdapter") |
return GetMissingCharacteristicHeartRateAdapter(); |
if (fake_adapter_name == "HeartRateAdapter") |
return GetHeartRateAdapter(); |
- if (fake_adapter_name == "EmptyNameDeviceAdapter") |
- return GetEmptyNameDeviceAdapter(); |
if (fake_adapter_name == "NoNameDeviceAdapter") |
return GetNoNameDeviceAdapter(); |
if (fake_adapter_name == "EmptyNameHeartRateAdapter") |
@@ -402,27 +396,6 @@ LayoutTestBluetoothAdapterProvider::GetGlucoseHeartRateAdapter() { |
return adapter; |
} |
-// static |
-scoped_refptr<NiceMockBluetoothAdapter> |
-LayoutTestBluetoothAdapterProvider::GetUnicodeDeviceAdapter() { |
- scoped_refptr<NiceMockBluetoothAdapter> adapter(GetEmptyAdapter()); |
- |
- adapter->AddMockDevice(GetBaseDevice(adapter.get(), "❤❤❤❤❤❤❤❤❤")); |
- |
- return adapter; |
-} |
- |
-// static |
-scoped_refptr<NiceMockBluetoothAdapter> |
-LayoutTestBluetoothAdapterProvider::GetDeviceNameLongerThan29BytesAdapter() { |
- scoped_refptr<NiceMockBluetoothAdapter> adapter(GetEmptyAdapter()); |
- |
- adapter->AddMockDevice(GetBaseDevice(adapter.get(), |
- "a_device_name_that_is_longer_than_29_bytes_but_shorter_than_248_bytes")); |
- |
- return adapter; |
-} |
- |
// Adds a device to |adapter| and notifies all observers about that new device. |
// Mocks can call this asynchronously to cause changes in the middle of a test. |
static void AddDevice(scoped_refptr<NiceMockBluetoothAdapter> adapter, |
@@ -790,16 +763,6 @@ LayoutTestBluetoothAdapterProvider::GetDisconnectingHealthThermometer( |
// static |
scoped_refptr<NiceMockBluetoothAdapter> |
-LayoutTestBluetoothAdapterProvider::GetEmptyNameDeviceAdapter() { |
- scoped_refptr<NiceMockBluetoothAdapter> adapter(GetEmptyAdapter()); |
- auto device(GetConnectableDevice(adapter.get(), "" /* device_name */)); |
- |
- adapter->AddMockDevice(std::move(device)); |
- return adapter; |
-} |
- |
-// static |
-scoped_refptr<NiceMockBluetoothAdapter> |
LayoutTestBluetoothAdapterProvider::GetNoNameDeviceAdapter() { |
scoped_refptr<NiceMockBluetoothAdapter> adapter(GetEmptyAdapter()); |
auto device(GetConnectableDevice(adapter.get(), nullptr /* device_name */)); |