bluetooth:android: Return the advertised name if advertising

device/bluetooth/test/bluetooth_test.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.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_common.h"
 
 namespace device {
 
 const std::string BluetoothTestBase::kTestAdapterName = "FakeBluetoothAdapter";
 const std::string BluetoothTestBase::kTestAdapterAddress = "A1:B2:C3:D4:E5:F6";
 
-const std::string BluetoothTestBase::kTestDeviceName = "FakeBluetoothDevice";
+const std::string BluetoothTestBase::kTestDeviceGapName = "FakeBluetoothDevice";
+const std::string BluetoothTestBase::kTestDeviceAdvertisedName =
+    "FakeBluetooth";
 const std::string BluetoothTestBase::kTestDeviceNameEmpty = "";
 
 const std::string BluetoothTestBase::kTestDeviceAddress1 = "01:00:00:90:1E:BE";
 const std::string BluetoothTestBase::kTestDeviceAddress2 = "02:00:00:8B:74:63";
 const std::string BluetoothTestBase::kTestDeviceAddress3 = "03:00:00:17:C0:57";
 
 const std::string BluetoothTestBase::kTestUUIDGenericAccess = "1800";
 const std::string BluetoothTestBase::kTestUUIDGenericAttribute = "1801";
 const std::string BluetoothTestBase::kTestUUIDImmediateAlert = "1802";
 const std::string BluetoothTestBase::kTestUUIDLinkLoss = "1803";
@@ skipping 342 matching lines @@
   gatt_write_characteristic_attempts_ = 0;
   gatt_read_descriptor_attempts_ = 0;
   gatt_write_descriptor_attempts_ = 0;
 }
 
 void BluetoothTestBase::RemoveTimedOutDevices() {
   adapter_->RemoveTimedOutDevices();
 }
 
 }  // namespace device