device/bluetooth/dbus/bluetooth_gatt_application_service_provider_unittest.cc - Issue 2254833003: Re-write many calls to WrapUnique() with MakeUnique()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: device/bluetooth/dbus/bluetooth_gatt_application_service_provider_unittest.cc

Issue 2254833003: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « device/bluetooth/dbus/bluetooth_gatt_application_service_provider.cc ('k') | device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/bluetooth/dbus/bluetooth_gatt_application_service_provider_unittest.cc

diff --git a/device/bluetooth/dbus/bluetooth_gatt_application_service_provider_unittest.cc b/device/bluetooth/dbus/bluetooth_gatt_application_service_provider_unittest.cc

index fecb8fe5792bb147b53664fefa475f15baab41ae..da236c3fa162efe1c2030d587e8f9f6f42c6c467 100644

--- a/device/bluetooth/dbus/bluetooth_gatt_application_service_provider_unittest.cc

+++ b/device/bluetooth/dbus/bluetooth_gatt_application_service_provider_unittest.cc

@@ -293,9 +293,9 @@ class BluetoothGattApplicationServiceProviderTest : public testing::Test {

const std::string& full_service_path =

std::string(kAppObjectPath) + "/" + service_path;

app_provider->service_providers_.push_back(

- base::WrapUnique(new BluetoothGattServiceServiceProviderImpl(

+ base::MakeUnique<BluetoothGattServiceServiceProviderImpl>(

nullptr, dbus::ObjectPath(full_service_path), kFakeServiceUuid,

- true, std::vector<dbus::ObjectPath>())));

+ true, std::vector<dbus::ObjectPath>()));

return full_service_path;

}

@@ -350,9 +350,9 @@ class BluetoothGattApplicationServiceProviderTest : public testing::Test {

TEST_F(BluetoothGattApplicationServiceProviderTest, GetManagedObjects) {

std::unique_ptr<BluetoothGattApplicationServiceProviderImpl> app_provider =

- base::WrapUnique(new BluetoothGattApplicationServiceProviderImpl(

+ base::MakeUnique<BluetoothGattApplicationServiceProviderImpl>(

nullptr, dbus::ObjectPath(kAppObjectPath),

- std::map<dbus::ObjectPath, BluetoothLocalGattServiceBlueZ*>()));

+ std::map<dbus::ObjectPath, BluetoothLocalGattServiceBlueZ*>());

CreateFakeAttributes(app_provider.get());

dbus::MethodCall method_call("com.example.Interface", "SomeMethod");

@@ -364,9 +364,9 @@ TEST_F(BluetoothGattApplicationServiceProviderTest, GetManagedObjects) {

TEST_F(BluetoothGattApplicationServiceProviderTest, SendValueChanged) {

std::unique_ptr<BluetoothGattApplicationServiceProviderImpl> app_provider =

- base::WrapUnique(new BluetoothGattApplicationServiceProviderImpl(

+ base::MakeUnique<BluetoothGattApplicationServiceProviderImpl>(

nullptr, dbus::ObjectPath(kAppObjectPath),

- std::map<dbus::ObjectPath, BluetoothLocalGattServiceBlueZ*>()));

+ std::map<dbus::ObjectPath, BluetoothLocalGattServiceBlueZ*>());

const std::string& kServicePath =

CreateFakeService(app_provider.get(), "service0");

const std::string& kCharacteristicPath = CreateFakeCharacteristic(