| Index: extensions/browser/api/bluetooth/bluetooth_apitest.cc
|
| diff --git a/extensions/browser/api/bluetooth/bluetooth_apitest.cc b/extensions/browser/api/bluetooth/bluetooth_apitest.cc
|
| index 43ffddb48447589d416dac435b502690171be6e6..ffe204d95f91efa20e87999664fabbaa7a2c8fe8 100644
|
| --- a/extensions/browser/api/bluetooth/bluetooth_apitest.cc
|
| +++ b/extensions/browser/api/bluetooth/bluetooth_apitest.cc
|
| @@ -155,8 +155,9 @@ IN_PROC_BROWSER_TEST_F(BluetoothApiTest, DeviceEvents) {
|
| event_router()->DeviceAdded(mock_adapter_, device1_.get());
|
| event_router()->DeviceAdded(mock_adapter_, device2_.get());
|
|
|
| - EXPECT_CALL(*device2_, GetDeviceName())
|
| - .WillRepeatedly(testing::Return("the real d2"));
|
| + EXPECT_CALL(*device2_, GetName())
|
| + .WillRepeatedly(
|
| + testing::Return(base::Optional<std::string>("the real d2")));
|
| EXPECT_CALL(*device2_, GetNameForDisplay())
|
| .WillRepeatedly(testing::Return(base::UTF8ToUTF16("the real d2")));
|
| event_router()->DeviceChanged(mock_adapter_, device2_.get());
|
| @@ -412,8 +413,9 @@ IN_PROC_BROWSER_TEST_F(BluetoothApiTest, DeviceInfo) {
|
|
|
| EXPECT_CALL(*device1_, GetAddress())
|
| .WillRepeatedly(testing::Return("A4:17:31:00:00:00"));
|
| - EXPECT_CALL(*device1_, GetDeviceName())
|
| - .WillRepeatedly(testing::Return("Chromebook Pixel"));
|
| + EXPECT_CALL(*device1_, GetName())
|
| + .WillRepeatedly(
|
| + testing::Return(base::Optional<std::string>("Chromebook Pixel")));
|
| EXPECT_CALL(*device1_, GetNameForDisplay())
|
| .WillRepeatedly(testing::Return(base::UTF8ToUTF16("Chromebook Pixel")));
|
| EXPECT_CALL(*device1_, GetBluetoothClass())
|
|
|