device/bluetooth/test/mock_bluetooth_adapter.h - Issue 812673002: bluetooth: BluetoothAdapterDeleter used to control BluetoothAdapter destruction.

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/test/mock_bluetooth_adapter.h

Issue 812673002: bluetooth: BluetoothAdapterDeleter used to control BluetoothAdapter destruction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr

Patch Set: respond to armansito & fix Mock Created 6 years 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

Index: device/bluetooth/test/mock_bluetooth_adapter.h

diff --git a/device/bluetooth/test/mock_bluetooth_adapter.h b/device/bluetooth/test/mock_bluetooth_adapter.h

index 2208bfd5b38325082e90ef0a33c6d0bf431e0b7c..bd678cc17d90049d5a5ad3f6bc4470d59e13ca92 100644

--- a/device/bluetooth/test/mock_bluetooth_adapter.h

+++ b/device/bluetooth/test/mock_bluetooth_adapter.h

@@ -33,6 +33,7 @@ class MockBluetoothAdapter : public BluetoothAdapter {

virtual bool IsInitialized() const { return true; }

+ MOCK_METHOD0(DeleteOnCorrectThread, void());

armansito 2014/12/16 22:17:18 Remove this, now that there's an actual implementa

scheib 2014/12/16 22:28:45 Done.

MOCK_METHOD1(AddObserver, void(BluetoothAdapter::Observer*));

MOCK_METHOD1(RemoveObserver, void(BluetoothAdapter::Observer*));

MOCK_CONST_METHOD0(GetAddress, std::string());

@@ -78,6 +79,7 @@ class MockBluetoothAdapter : public BluetoothAdapter {

const CreateServiceErrorCallback& error_callback));

protected:

+ void DeleteOnCorrectThread() const override;

virtual void AddDiscoverySession(const base::Closure& callback,

const ErrorCallback& error_callback);

virtual void RemoveDiscoverySession(const base::Closure& callback,

« no previous file with comments | « device/bluetooth/bluetooth_adapter_win.cc ('k') | device/bluetooth/test/mock_bluetooth_adapter.cc » ('j') | no next file with comments »