bluetooth:android: Return the advertised name if advertising

device/bluetooth/test/bluetooth_test.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 DEVICE_BLUETOOTH_TEST_BLUETOOTH_TEST_H_
 #define DEVICE_BLUETOOTH_TEST_BLUETOOTH_TEST_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 26 matching lines @@
 //
 // Subclasses on each platform implement this, and are then typedef-ed to
 // BluetoothTest.
 class BluetoothTestBase : public testing::Test {
  public:
   enum class Call { EXPECTED, NOT_EXPECTED };
 
   static const std::string kTestAdapterName;
   static const std::string kTestAdapterAddress;
 
-  static const std::string kTestDeviceName;
+  static const std::string kTestDeviceGapName;
+  static const std::string kTestDeviceAdvertisedName;
   static const std::string kTestDeviceNameEmpty;
 
   static const std::string kTestDeviceAddress1;
   static const std::string kTestDeviceAddress2;
   static const std::string kTestDeviceAddress3;
 
   // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.device.bluetooth.test
   enum class TestRSSI {
     LOWEST = -81,
     LOWER = -61,
@@ skipping 45 matching lines @@
   // Initializes the BluetoothAdapter |adapter_| with a fake adapter that can be
   // controlled by this test fixture.
   virtual void InitWithFakeAdapter() {}
 
   // Configures the fake adapter to lack the necessary permissions to scan for
   // devices.  Returns false if the current platform always has permission.
   virtual bool DenyPermission();
 
   // Create a fake Low Energy device and discover it.
   // |device_ordinal| selects between multiple fake device data sets to produce:
-  //   1: Name: kTestDeviceName
+  //   1: Name: kTestDeviceGapName
   //      Address:           kTestDeviceAddress1
+  //      TODO(crbug.com/630581): Add Advertised name to macOS.
+  //      AdvertisedName:    kTestDeviceAdvertisedName
   //      RSSI:              kTestRSSI1
   //      Advertised UUIDs: {kTestUUIDGenericAccess, kTestUUIDGenericAttribute}
   //      Service Data:     {kTestUUIDHeartRate: [1]}
   //      Tx Power:          kTestTxPower1
-  //   2: Name: kTestDeviceName
+  //   2: Name: kTestDeviceGapName
   //      Address:           kTestDeviceAddress1
   //      RSSI:              kTestRSSI2
   //      Advertised UUIDs: {kTestUUIDImmediateAlert, kTestUUIDLinkLoss}
   //      Service Data:     {kTestUUIDHeartRate: [2],
   //                         kTestUUIDImmediateAlert: [0]}
   //      Tx Power:          kTestTxPower2
   //   3: Name:    kTestDeviceNameEmpty
   //      Address: kTestDeviceAddress1
   //      RSSI:    kTestRSSI3
   //      No Advertised UUIDs
   //      No Service Data
   //      No Tx Power
   //   4: Name:    kTestDeviceNameEmpty
   //      Address: kTestDeviceAddress2
   //      RSSI:    kTestRSSI4
   //      No Advertised UUIDs
   //      No Service Data
   //      No Tx Power
   //   5: No name device
   //      Address: kTestDeviceAddress1
   //      RSSI:    kTestRSSI5
   //      No Advertised UUIDs
   //      No Service Data
   //      No Tx Power
-  //   6: Name:    kTestDeviceName
+  //   6: Name:    kTestDeviceGapName
   //      Address: kTestDeviceAddress2
   //      RSSI:    kTestRSSI1,
   //      No Advertised UUIDs
   //      No Service Data
   //      No Tx Power
   //      Supports BR/EDR and LE.
   virtual BluetoothDevice* SimulateLowEnergyDevice(int device_ordinal);
 
   // Create a fake classic device and discover it. The device will have
-  // name kTestDeviceName, no advertised UUIDs and address kTestDeviceAddress3.
+  // name kTestDeviceGapName, no advertised UUIDs and address
+  // kTestDeviceAddress3.
   virtual BluetoothDevice* SimulateClassicDevice();
 
   // Remembers |device|'s platform specific object to be used in a
   // subsequent call to methods such as SimulateGattServicesDiscovered that
   // accept a nullptr value to select this remembered characteristic. This
   // enables tests where the platform attempts to reference device
   // objects after the Chrome objects have been deleted, e.g. with DeleteDevice.
   virtual void RememberDeviceForSubsequentAction(BluetoothDevice* device) {}
 
   // Simulates success of implementation details of CreateGattConnection.
@@ skipping 317 matching lines @@
   int actual_error_callback_calls_ = 0;
   bool unexpected_success_callback_ = false;
   bool unexpected_error_callback_ = false;
 
   base::WeakPtrFactory<BluetoothTestBase> weak_factory_;
 };
 
 }  // namespace device
 
 #endif  // DEVICE_BLUETOOTH_TEST_BLUETOOTH_TEST_H_