| Index: device/bluetooth/bluetooth_advertisement_bluez_unittest.cc
|
| diff --git a/device/bluetooth/bluetooth_advertisement_bluez_unittest.cc b/device/bluetooth/bluetooth_advertisement_bluez_unittest.cc
|
| index b3a67020a135ea644c49942c2f6a619f23989daf..ea933fcbce674781ca440934a44bba2e45bcd432 100644
|
| --- a/device/bluetooth/bluetooth_advertisement_bluez_unittest.cc
|
| +++ b/device/bluetooth/bluetooth_advertisement_bluez_unittest.cc
|
| @@ -93,14 +93,14 @@ class BluetoothAdvertisementBlueZTest : public testing::Test {
|
| make_scoped_ptr(new BluetoothAdvertisement::Data(
|
| BluetoothAdvertisement::ADVERTISEMENT_TYPE_BROADCAST));
|
| data->set_service_uuids(
|
| - make_scoped_ptr(new BluetoothAdvertisement::UUIDList()).Pass());
|
| + make_scoped_ptr(new BluetoothAdvertisement::UUIDList()));
|
| data->set_manufacturer_data(
|
| - make_scoped_ptr(new BluetoothAdvertisement::ManufacturerData()).Pass());
|
| + make_scoped_ptr(new BluetoothAdvertisement::ManufacturerData()));
|
| data->set_solicit_uuids(
|
| - make_scoped_ptr(new BluetoothAdvertisement::UUIDList()).Pass());
|
| + make_scoped_ptr(new BluetoothAdvertisement::UUIDList()));
|
| data->set_service_data(
|
| - make_scoped_ptr(new BluetoothAdvertisement::ServiceData()).Pass());
|
| - return data.Pass();
|
| + make_scoped_ptr(new BluetoothAdvertisement::ServiceData()));
|
| + return data;
|
| }
|
|
|
| // Creates and registers an advertisement with the adapter.
|
| @@ -109,7 +109,7 @@ class BluetoothAdvertisementBlueZTest : public testing::Test {
|
| advertisement_ = nullptr;
|
|
|
| adapter_->RegisterAdvertisement(
|
| - CreateAdvertisementData().Pass(),
|
| + CreateAdvertisementData(),
|
| base::Bind(&BluetoothAdvertisementBlueZTest::RegisterCallback,
|
| base::Unretained(this)),
|
| base::Bind(&BluetoothAdvertisementBlueZTest::AdvertisementErrorCallback,
|
|
|