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/proxy_factory.h b/proxy_factory.h
index a55c392..f743554 100644
--- a/proxy_factory.h
+++ b/proxy_factory.h
@@ -16,19 +16,19 @@
namespace shill {
+class DBusPropertiesProxyDelegate;
class DBusPropertiesProxyInterface;
-class DBusPropertiesProxyListener;
class DHCPProxyInterface;
+class ModemCDMAProxyDelegate;
class ModemCDMAProxyInterface;
-class ModemCDMAProxyListener;
+class ModemGSMCardProxyDelegate;
class ModemGSMCardProxyInterface;
-class ModemGSMCardProxyListener;
+class ModemGSMNetworkProxyDelegate;
class ModemGSMNetworkProxyInterface;
-class ModemGSMNetworkProxyListener;
class ModemManager;
class ModemManagerProxyInterface;
+class ModemProxyDelegate;
class ModemProxyInterface;
-class ModemProxyListener;
class ModemSimpleProxyInterface;
class SupplicantInterfaceProxyInterface;
class SupplicantProcessProxyInterface;
@@ -44,7 +44,7 @@
void Init();
virtual DBusPropertiesProxyInterface *CreateDBusPropertiesProxy(
- DBusPropertiesProxyListener *listener,
+ DBusPropertiesProxyDelegate *delegate,
const std::string &path,
const std::string &service);
@@ -53,7 +53,7 @@
const std::string &path,
const std::string &service);
- virtual ModemProxyInterface *CreateModemProxy(ModemProxyListener *listener,
+ virtual ModemProxyInterface *CreateModemProxy(ModemProxyDelegate *delegate,
const std::string &path,
const std::string &service);
@@ -62,17 +62,17 @@
const std::string &service);
virtual ModemCDMAProxyInterface *CreateModemCDMAProxy(
- ModemCDMAProxyListener *listener,
+ ModemCDMAProxyDelegate *delegate,
const std::string &path,
const std::string &service);
virtual ModemGSMCardProxyInterface *CreateModemGSMCardProxy(
- ModemGSMCardProxyListener *listener,
+ ModemGSMCardProxyDelegate *delegate,
const std::string &path,
const std::string &service);
virtual ModemGSMNetworkProxyInterface *CreateModemGSMNetworkProxy(
- ModemGSMNetworkProxyListener *listener,
+ ModemGSMNetworkProxyDelegate *delegate,
const std::string &path,
const std::string &service);