bluetooth: Remove BluetoothAdvertisementData

content/shell/browser/layout_test/layout_test_bluetooth_adapter_provider.cc

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 3bbf1692ca919e55c2c4a05ada02c5c72ab54e0c..9f326f5cdcc3030a937c869c479ebe787f322d62 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
@@ -79,10 +79,6 @@ const char kHeartRateMeasurementUUID[] = "2a37";
 const char kSerialNumberStringUUID[] = "2a25";
 const char kPeripheralPrivacyFlagUUID[] = "2a02";
 
-const int kDefaultTxPower = -10;  // TxPower of a device broadcasting at 0.1mW.
-const int kDefaultRssi = -51;     // RSSI at 1m from a device broadcasting at
-                                  // 0.1mW.
-
 // Invokes Run() on the k-th argument of the function with no arguments.
 ACTION_TEMPLATE(RunCallback,
                 HAS_1_TEMPLATE_PARAMS(int, k),
@@ -173,40 +169,6 @@ LayoutTestBluetoothAdapterProvider::GetBluetoothAdapter(
   if (fake_adapter_name.empty())
     return nullptr;
 
-  if (base::StartsWith(fake_adapter_name, "PowerValueAdapter",
-                       base::CompareCase::SENSITIVE)) {
-    std::vector<StringPiece> args =
-        base::SplitStringPiece(fake_adapter_name, ":", base::KEEP_WHITESPACE,
-                               base::SPLIT_WANT_NONEMPTY);
-    DCHECK(args[0] == "PowerValueAdapter");
-    DCHECK(args.size() == 3) << "Should contain AdapterName:TxPower:RSSI";
-
-    int tx_power;
-    base::StringToInt(args[1], &tx_power);
-    DCHECK(tx_power >= INT8_MIN && tx_power <= INT8_MAX)
-        << "Must be between [-128, 127]";
-    int rssi;
-    base::StringToInt(args[2], &rssi);
-    DCHECK(rssi >= INT8_MIN && rssi <= INT8_MAX)
-        << "Must be between [-128, 127]";
-    return GetPowerValueAdapter(tx_power, rssi);
-  }
-
-  if (base::StartsWith(fake_adapter_name, "PowerPresenceAdapter",
-                       base::CompareCase::SENSITIVE)) {
-    std::vector<StringPiece> args =
-        base::SplitStringPiece(fake_adapter_name, ":", base::KEEP_WHITESPACE,
-                               base::SPLIT_WANT_NONEMPTY);
-    DCHECK(args[0] == "PowerPresenceAdapter");
-    DCHECK(args.size() == 3)
-        << "Should contain AdapterName:TxPowerPresent:RSSIPResent";
-    DCHECK(args[1] == "true" || args[1] == "false");
-    DCHECK(args[2] == "true" || args[2] == "false");
-
-    return GetPowerPresenceAdapter(args[1] == "true" /* tx_power_present */,
-                                   args[2] == "true" /* rssi_present */);
-  }
-
   NOTREACHED() << fake_adapter_name;
   return nullptr;
 }
@@ -321,36 +283,6 @@ LayoutTestBluetoothAdapterProvider::GetEmptyAdapter() {
 
 // static
 scoped_refptr<NiceMockBluetoothAdapter>
-LayoutTestBluetoothAdapterProvider::GetPowerValueAdapter(int8_t tx_power,
-                                                         int8_t rssi) {
-  scoped_refptr<NiceMockBluetoothAdapter> adapter(GetEmptyAdapter());
-  std::unique_ptr<NiceMockBluetoothDevice> device(
-      GetHeartRateDevice(adapter.get()));
-
-  ON_CALL(*device, GetInquiryTxPower()).WillByDefault(Return(tx_power));
-  ON_CALL(*device, GetInquiryRSSI()).WillByDefault(Return(rssi));
-
-  adapter->AddMockDevice(std::move(device));
-
-  return adapter;
-}
-
-// static
-scoped_refptr<NiceMockBluetoothAdapter>
-LayoutTestBluetoothAdapterProvider::GetPowerPresenceAdapter(
-    bool tx_power_present,
-    bool rssi_present) {
-  // TODO(ortuno): RSSI Unknown and Tx Power Unknown should have different
-  // values. Add kUnknownTxPower when implemented: http://crbug.com/551572
-  int tx_power =
-      tx_power_present ? kDefaultTxPower : BluetoothDevice::kUnknownPower;
-  int rssi = rssi_present ? kDefaultRssi : BluetoothDevice::kUnknownPower;
-
-  return GetPowerValueAdapter(tx_power, rssi);
-}
-
-// static
-scoped_refptr<NiceMockBluetoothAdapter>
 LayoutTestBluetoothAdapterProvider::GetGlucoseHeartRateAdapter() {
   scoped_refptr<NiceMockBluetoothAdapter> adapter(GetEmptyAdapter());