device/bluetooth/bluetooth_device_win_unittest.cc - Issue 1284073002: bluetooth: Add adapter to BluetoothDevice

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/bluetooth_device_win_unittest.cc

Issue 1284073002: bluetooth: Add adapter to BluetoothDevice (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bt-drop-callback-

Patch Set: Updated patchset dependency Created 5 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

« device/bluetooth/bluetooth_device_chromeos.cc ('K') | « device/bluetooth/bluetooth_device_win.cc ('k') | device/bluetooth/bluetooth_low_energy_device_mac.h » ('j') | device/bluetooth/test/mock_bluetooth_gatt_connection.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/bluetooth/bluetooth_device_win_unittest.cc

diff --git a/device/bluetooth/bluetooth_device_win_unittest.cc b/device/bluetooth/bluetooth_device_win_unittest.cc

index 7fc8874fc3eab8899f4cdced9f795e2f815e3e3e..874f69c5f732408482cd98eb8a81d5876125a48f 100644

--- a/device/bluetooth/bluetooth_device_win_unittest.cc

+++ b/device/bluetooth/bluetooth_device_win_unittest.cc

@@ -64,21 +64,17 @@ class BluetoothDeviceWinTest : public testing::Test {

base::HexStringToBytes(kTestVideoSdpBytes, &video_state->sdp_bytes);

device_state_->service_record_states.push_back(video_state);

- device_.reset(new BluetoothDeviceWin(*device_state_,

- ui_task_runner,

- socket_thread,

- NULL,

+ device_.reset(new BluetoothDeviceWin(NULL, *device_state_, ui_task_runner,

+ socket_thread, NULL,

net::NetLog::Source()));

// Add empty device.

empty_device_state_.reset(new BluetoothTaskManagerWin::DeviceState());

empty_device_state_->name = kDeviceName;

empty_device_state_->address = kDeviceAddress;

- empty_device_.reset(new BluetoothDeviceWin(*empty_device_state_,

- ui_task_runner,

- socket_thread,

- NULL,

- net::NetLog::Source()));

+ empty_device_.reset(new BluetoothDeviceWin(NULL, *empty_device_state_,

+ ui_task_runner, socket_thread,

+ NULL, net::NetLog::Source()));

}

protected: