bluetooth: Add optional 'name' support to MockBluetoothDevice.

components/proximity_auth/ble/bluetooth_low_energy_connection_finder_unittest.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 "components/proximity_auth/ble/bluetooth_low_energy_connection_finder.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
@@ skipping 239 matching lines @@
 
 TEST_F(ProximityAuthBluetoothLowEnergyConnectionFinderTest,
        Find_CreatesConnectionWhenRightDeviceIsAdded_NoPublicAddress) {
   StrictMock<MockBluetoothLowEnergyConnectionFinder> connection_finder(
       nullptr, BluetoothLowEnergyConnectionFinder::FIND_ANY_DEVICE);
 
   FindAndExpectStartDiscovery(connection_finder);
   ExpectRemoveObserver();
 
   PrepareDevice(kServiceUUID, kTestRemoteDeviceBluetoothAddress, false);
-  ON_CALL(*device_, GetNameForDisplay())
-      .WillByDefault(Return(base::UTF8ToUTF16(kTestRemoteDeviceName)));
+  ON_CALL(*device_, GetName())
+      .WillByDefault(Return(std::string(kTestRemoteDeviceName)));
 
   connection_finder.ExpectCreateConnection();
   connection_finder.DeviceAdded(adapter_.get(), device_.get());
 }
 
 TEST_F(ProximityAuthBluetoothLowEnergyConnectionFinderTest,
        Find_DoesntCreatesConnectionWhenWrongDeviceIsAdded_NoPublicAddress) {
   StrictMock<MockBluetoothLowEnergyConnectionFinder> connection_finder(
       nullptr, BluetoothLowEnergyConnectionFinder::FIND_ANY_DEVICE);
 
   FindAndExpectStartDiscovery(connection_finder);
   ExpectRemoveObserver();
 
   PrepareDevice(kOtherUUID, kTestRemoteDeviceBluetoothAddress, false);
-  ON_CALL(*device_, GetNameForDisplay())
-      .WillByDefault(Return(base::UTF8ToUTF16("Other name")));
+  ON_CALL(*device_, GetName()).WillByDefault(Return(std::string("Other name")));
 
   EXPECT_CALL(connection_finder, CreateConnectionProxy()).Times(0);
   connection_finder.DeviceAdded(adapter_.get(), device_.get());
 }
 
 TEST_F(ProximityAuthBluetoothLowEnergyConnectionFinderTest,
        Find_CreatesConnectionWhenRightDeviceIsAdded_HasPublicAddress) {
   StrictMock<MockBluetoothLowEnergyConnectionFinder> connection_finder(
       nullptr, BluetoothLowEnergyConnectionFinder::FIND_ANY_DEVICE);
 
@@ skipping 198 matching lines @@
   // Completing the connection.
   base::RunLoop run_loop;
   ASSERT_FALSE(last_found_connection_);
   connection->SetStatus(Connection::IN_PROGRESS);
   connection->SetStatus(Connection::CONNECTED);
   run_loop.RunUntilIdle();
   EXPECT_TRUE(last_found_connection_);
 }
 
 }  // namespace proximity_auth