chromeos/dbus/mock_shill_device_client.h - Issue 10949030: This converts the Shill clients to allow propagation of shill errors

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: chromeos/dbus/mock_shill_device_client.h

Issue 10949030: This converts the Shill clients to allow propagation of shill errors (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 8 years, 3 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

« chrome/browser/chromeos/cros/cros_network_functions_unittest.cc ('K') | « chrome/browser/chromeos/cros/cros_network_functions_unittest.cc ('k') | chromeos/dbus/mock_shill_ipconfig_client.h » ('j') | chromeos/dbus/shill_client_helper.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromeos/dbus/mock_shill_device_client.h

diff --git a/chromeos/dbus/mock_shill_device_client.h b/chromeos/dbus/mock_shill_device_client.h

index 3110ee5352df29f2656629879cd16c248df1bafd..1b9c863c42c5cf002f12913a853a25b7e9dbfd6b 100644

--- a/chromeos/dbus/mock_shill_device_client.h

+++ b/chromeos/dbus/mock_shill_device_client.h

@@ -17,21 +17,23 @@ class MockShillDeviceClient : public ShillDeviceClient {

MockShillDeviceClient();

virtual ~MockShillDeviceClient();

- MOCK_METHOD2(SetPropertyChangedHandler,

+ MOCK_METHOD2(AddPropertyChangedObserver,

void(const dbus::ObjectPath& device_path,

- const PropertyChangedHandler& handler));

- MOCK_METHOD1(ResetPropertyChangedHandler,

- void(const dbus::ObjectPath& device_path));

+ PropertyChangedObserver* observer));

+ MOCK_METHOD2(RemovePropertyChangedObserver,

+ void(const dbus::ObjectPath& device_path,

+ PropertyChangedObserver* observer));

MOCK_METHOD2(GetProperties, void(const dbus::ObjectPath& device_path,

const DictionaryValueCallback& callback));

MOCK_METHOD1(CallGetPropertiesAndBlock,

base::DictionaryValue*(const dbus::ObjectPath& device_path));

MOCK_METHOD2(ProposeScan, void(const dbus::ObjectPath& device_path,

const VoidDBusMethodCallback& callback));

- MOCK_METHOD4(SetProperty, void(const dbus::ObjectPath& device_path,

+ MOCK_METHOD5(SetProperty, void(const dbus::ObjectPath& device_path,

const std::string& name,

const base::Value& value,

- const VoidDBusMethodCallback& callback));

+ const base::Closure& callback,

+ const ErrorCallback& error_callback));

MOCK_METHOD3(ClearProperty, void(const dbus::ObjectPath& device_path,

const std::string& name,

const VoidDBusMethodCallback& callback));