commit 580c7af6aeddc277de482c7c60826bbce4e0a524
author Darin Petkov <petkov@chromium.org> Mon Oct 24 12:32:50 2011 +0200
committer Gerrit <chrome-bot@google.com> Mon Oct 24 14:04:25 2011 -0700
tree dbc4fcbf8f41bbc7c991806518003d2a6ff7bc75
parent 6515aabcd1fbbb9ff2090c9675c17eeef64e7474

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>

modem_cdma_proxy.cc

diff --git a/modem_cdma_proxy.cc b/modem_cdma_proxy.cc
index 6e50df6..1311cb0 100644
--- a/modem_cdma_proxy.cc
+++ b/modem_cdma_proxy.cc
@@ -10,11 +10,11 @@
 
 namespace shill {
 
-ModemCDMAProxy::ModemCDMAProxy(ModemCDMAProxyListener *listener,
+ModemCDMAProxy::ModemCDMAProxy(ModemCDMAProxyDelegate *delegate,
                                DBus::Connection *connection,
                                const string &path,
                                const string &service)
-    : proxy_(listener, connection, path, service) {}
+    : proxy_(delegate, connection, path, service) {}
 
 ModemCDMAProxy::~ModemCDMAProxy() {}
 
@@ -35,12 +35,12 @@
   return proxy_.Meid();
 }
 
-ModemCDMAProxy::Proxy::Proxy(ModemCDMAProxyListener *listener,
+ModemCDMAProxy::Proxy::Proxy(ModemCDMAProxyDelegate *delegate,
                              DBus::Connection *connection,
                              const string &path,
                              const string &service)
     : DBus::ObjectProxy(*connection, path, service.c_str()),
-      listener_(listener) {}
+      delegate_(delegate) {}
 
 ModemCDMAProxy::Proxy::~Proxy() {}
 
@@ -50,20 +50,20 @@
     const DBusPropertiesMap &status_changes) {
   VLOG(2) << __func__ << "(" << activation_state << ", " << activation_error
           << ")";
-  listener_->OnCDMAActivationStateChanged(
+  delegate_->OnCDMAActivationStateChanged(
       activation_state, activation_error, status_changes);
 }
 
 void ModemCDMAProxy::Proxy::SignalQuality(const uint32 &quality) {
   VLOG(2) << __func__ << "(" << quality << ")";
-  listener_->OnCDMASignalQualityChanged(quality);
+  delegate_->OnCDMASignalQualityChanged(quality);
 }
 
 void ModemCDMAProxy::Proxy::RegistrationStateChanged(
     const uint32 &cdma_1x_state,
     const uint32 &evdo_state) {
   VLOG(2) << __func__ << "(" << cdma_1x_state << ", " << evdo_state << ")";
-  listener_->OnCDMARegistrationStateChanged(cdma_1x_state, evdo_state);
+  delegate_->OnCDMARegistrationStateChanged(cdma_1x_state, evdo_state);
 }
 
 }  // namespace shill