bluetooth:android: Return the advertised name if advertising

device/bluetooth/test/bluetooth_test_bluez.cc

 // 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.
 
 #include "device/bluetooth/test/bluetooth_test_bluez.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 76 matching lines @@
   adapter_ = new bluez::BluetoothAdapterBlueZ(
       base::Bind(&AdapterCallback, run_loop.QuitClosure()));
   run_loop.Run();
 }
 
 BluetoothDevice* BluetoothTestBlueZ::SimulateLowEnergyDevice(
     int device_ordinal) {
   if (device_ordinal > 6 || device_ordinal < 1)
     return nullptr;
 
-  base::Optional<std::string> device_name = kTestDeviceName;
+  base::Optional<std::string> device_name = kTestDeviceGapName;
   std::string device_address = kTestDeviceAddress1;
   std::vector<std::string> service_uuids;
   BluetoothTransport device_type = BLUETOOTH_TRANSPORT_LE;
 
   switch (device_ordinal) {
     case 1:
       service_uuids.push_back(kTestUUIDGenericAccess);
       service_uuids.push_back(kTestUUIDGenericAttribute);
       break;
     case 2:
@@ skipping 21 matching lines @@
         /* name */ device_name,
         /* alias */ device_name.value_or("") + "(alias)", device_address,
         service_uuids, device_type);
   }
   BluetoothDevice* device = adapter_->GetDevice(device_address);
 
   return device;
 }
 
 BluetoothDevice* BluetoothTestBlueZ::SimulateClassicDevice() {
-  std::string device_name = kTestDeviceName;
+  std::string device_name = kTestDeviceGapName;
   std::string device_address = kTestDeviceAddress3;
   std::vector<std::string> service_uuids;
 
   if (!adapter_->GetDevice(device_address)) {
     fake_bluetooth_device_client_->CreateTestDevice(
         dbus::ObjectPath(bluez::FakeBluetoothAdapterClient::kAdapterPath),
         device_name /* name */, device_name /* alias */, device_address,
         service_uuids, BLUETOOTH_TRANSPORT_CLASSIC);
   }
   return adapter_->GetDevice(device_address);
@@ skipping 167 matching lines @@
   std::vector<BluetoothLocalGattService*> services;
   bluez::BluetoothAdapterBlueZ* adapter_bluez =
       static_cast<bluez::BluetoothAdapterBlueZ*>(adapter_.get());
 
   for (const auto& iter : adapter_bluez->registered_gatt_services_)
     services.push_back(iter.second);
   return services;
 }
 
 }  // namespace device