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

Unified Diff: device/bluetooth/test/bluetooth_test.h

Issue 1265023004: Revert of Bringing 4 more BluetoothTest.* unit tests to Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scheibtest
Patch Set: Created 5 years, 5 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: device/bluetooth/test/bluetooth_test.h
diff --git a/device/bluetooth/test/bluetooth_test.h b/device/bluetooth/test/bluetooth_test.h
index 7a0ed0e29f4d06d278ab356f50088815ea90a80d..a45373b0cfa759d8c71a73af09ae9b64c2228d9b 100644
--- a/device/bluetooth/test/bluetooth_test.h
+++ b/device/bluetooth/test/bluetooth_test.h
@@ -25,22 +25,8 @@
static const std::string kTestAdapterName;
static const std::string kTestAdapterAddress;
- static const std::string kTestDeviceName;
- static const std::string kTestDeviceNameEmpty;
-
- static const std::string kTestDeviceAddress1;
- static const std::string kTestDeviceAddress2;
-
- static const std::string kTestUUIDGenericAccess;
- static const std::string kTestUUIDGenericAttribute;
- static const std::string kTestUUIDImmediateAlert;
- static const std::string kTestUUIDLinkLoss;
-
BluetoothTestBase();
~BluetoothTestBase() override;
-
- // Check if Low Energy is available. On Mac, we require OS X >= 10.10.
- virtual bool PlatformSupportsLowEnergy() = 0;
// Initializes the BluetoothAdapter |adapter_| with the system adapter.
virtual void InitWithDefaultAdapter(){};
@@ -55,15 +41,11 @@
virtual void InitWithFakeAdapter(){};
// Create a fake Low Energy device and discover it.
- // |device_ordinal| selects between multiple fake device data sets to produce:
- // 1: kTestDeviceName with advertised UUIDs kTestUUIDGenericAccess,
- // kTestUUIDGenericAttribute and address kTestDeviceAddress1.
- // 2: kTestDeviceName with advertised UUIDs kTestUUIDImmediateAlert,
- // kTestUUIDLinkLoss and address kTestDeviceAddress1.
- // 3: kTestDeviceNameEmpty with no advertised UUIDs and address
- // kTestDeviceAddress1.
- // 4: kTestDeviceNameEmpty with no advertised UUIDs and address
- // kTestDeviceAddress2.
+ // |device_ordinal| selects between multiple fake device data sets to produce.
+ // 1: AA:00:00:00:00:01 with simple default values.
+ // 2: AA:00:00:00:00:01 with different advertised Service UUIDs vs 1.
+ // 3: AA:00:00:00:00:01 with empty name, empty UUIDs.
+ // 4: BB:00:00:00:00:02 with empty name, empty UUIDs.
virtual void DiscoverLowEnergyDevice(int device_ordinal){};
// Callbacks that increment |callback_count_|, |error_callback_count_|:

Powered by Google App Engine
This is Rietveld 408576698