trunk/src/device/bluetooth/bluetooth_device_win_unittest.cc - Issue 227493006: Revert 262175 "* Replace "read" method with onReceiveXxx events."

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: trunk/src/device/bluetooth/bluetooth_device_win_unittest.cc

Issue 227493006: Revert 262175 "* Replace "read" method with onReceiveXxx events." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 8 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 | « trunk/src/device/bluetooth/bluetooth_device_win.cc ('k') | trunk/src/device/bluetooth/bluetooth_profile_chromeos_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: trunk/src/device/bluetooth/bluetooth_device_win_unittest.cc

===================================================================

--- trunk/src/device/bluetooth/bluetooth_device_win_unittest.cc (revision 262179)

+++ trunk/src/device/bluetooth/bluetooth_device_win_unittest.cc (working copy)

@@ -6,12 +6,9 @@

#include "base/bind.h"

#include "base/memory/scoped_ptr.h"

#include "base/memory/scoped_vector.h"

-#include "base/sequenced_task_runner.h"

#include "base/strings/string_number_conversions.h"

-#include "base/test/test_simple_task_runner.h"

#include "device/bluetooth/bluetooth_device_win.h"

#include "device/bluetooth/bluetooth_service_record.h"

-#include "device/bluetooth/bluetooth_socket_thread_win.h"

#include "device/bluetooth/bluetooth_task_manager_win.h"

#include "device/bluetooth/bluetooth_uuid.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -63,23 +60,11 @@

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

device_state.service_record_states.push_back(video_state);

- scoped_refptr<base::SequencedTaskRunner> ui_task_runner(

- new base::TestSimpleTaskRunner());

- scoped_refptr<BluetoothSocketThreadWin> socket_thread(

- BluetoothSocketThreadWin::Get());

- device_.reset(new BluetoothDeviceWin(device_state,

- ui_task_runner,

- socket_thread,

- NULL,

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

+ device_.reset(new BluetoothDeviceWin(device_state));

// Add empty device.

device_state.service_record_states.clear();

- empty_device_.reset(new BluetoothDeviceWin(device_state,

- ui_task_runner,

- socket_thread,

- NULL,

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

+ empty_device_.reset(new BluetoothDeviceWin(device_state));

}

protected: