shill: Rename *ProxyListener to *ProxyDelegate to conform to coding style.
Coding style requires multiple inheritance only from pure interfaces tagged with
the Interface suffix. Chromium style allows Delegate instead of Interface.
After this change, a *ProxyInterface class is the RPC proxy abstraction provided
for unit test purposes, and a *ProxyDelegate can be inherited and implemented by
proxy clients to catch RPC callbacks. For example, ModemProxyInterface is the
interface to a ModemManager.Modem service, implemented concretely for dbus-c++
by the ModemProxy class; all callbacks get rerouted by ModemProxy to a
ModemProxyDelegate.
BUG=chromium-os:19115
TEST=unit tests
Change-Id: I75c4c5c1f256b338e665e77f58972ab75f39490e
Reviewed-on: http://gerrit.chromium.org/gerrit/10562
Tested-by: Darin Petkov <petkov@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>
Commit-Ready: Darin Petkov <petkov@chromium.org>
diff --git a/modem_proxy.cc b/modem_proxy.cc
index 1eb1b0c..98b085b 100644
--- a/modem_proxy.cc
+++ b/modem_proxy.cc
@@ -10,11 +10,11 @@
namespace shill {
-ModemProxy::ModemProxy(ModemProxyListener *listener,
+ModemProxy::ModemProxy(ModemProxyDelegate *delegate,
DBus::Connection *connection,
const string &path,
const string &service)
- : proxy_(listener, connection, path, service) {}
+ : proxy_(delegate, connection, path, service) {}
ModemProxy::~ModemProxy() {}
@@ -26,12 +26,12 @@
return proxy_.GetInfo();
}
-ModemProxy::Proxy::Proxy(ModemProxyListener *listener,
+ModemProxy::Proxy::Proxy(ModemProxyDelegate *delegate,
DBus::Connection *connection,
const string &path,
const string &service)
: DBus::ObjectProxy(*connection, path, service.c_str()),
- listener_(listener) {}
+ delegate_(delegate) {}
ModemProxy::Proxy::~Proxy() {}
@@ -39,7 +39,7 @@
const uint32 &_new,
const uint32 &reason) {
VLOG(2) << __func__ << "(" << old << ", " << _new << ", " << reason << ")";
- listener_->OnModemStateChanged(old, _new, reason);
+ delegate_->OnModemStateChanged(old, _new, reason);
}
} // namespace shill