commit 4c0724af38d0eaf7155bb789280940a41ef9f08c
author Jason Glasgow <jglasgow@chromium.org> Tue Apr 17 15:47:40 2012 -0400
committer Gerrit <chrome-bot@google.com> Wed Apr 18 12:37:36 2012 -0700
tree 4b407b7f4651e6a2f2e2431fea101d6bfe8c8d1a
parent 2f903b3842af547e062fbf7b21a04e103211dec3

shill: cellular: simplify property change notification

Simplify property change notification by using a single mechanism to
handle it instead of two.  Old style notifications are turned into new
style notifications by the modem object.

A few minor style clean ups -- remove std:: where not needed and
ensure that public interfaces are declared as public interfaces in
subclasses (i.e not protected).

BUG=chromium-os:29569
TEST=run unit tests

Change-Id: If8b957d8b6518c95fa1d20bdef7d1ec6a8ed5ea3
Reviewed-on: https://gerrit.chromium.org/gerrit/20395
Tested-by: Jason Glasgow <jglasgow@chromium.org>
Reviewed-by: Nathan J. Williams <njw@chromium.org>
Commit-Ready: Jason Glasgow <jglasgow@chromium.org>

cellular_capability_gsm.h

diff --git a/cellular_capability_gsm.h b/cellular_capability_gsm.h
index ec9260a..7aa6f82 100644
--- a/cellular_capability_gsm.h
+++ b/cellular_capability_gsm.h
@@ -7,6 +7,7 @@
 
 #include <deque>
 #include <string>
+#include <vector>
 
 #include <base/memory/scoped_ptr.h>
 #include <base/memory/weak_ptr.h>
@@ -66,8 +67,11 @@
   virtual std::string GetNetworkTechnologyString() const;
   virtual std::string GetRoamingStateString() const;
   virtual std::string GetTypeString() const { return "GSM"; }
-  virtual void OnModemManagerPropertiesChanged(
-      const DBusPropertiesMap &properties);
+  virtual void OnDBusPropertiesChanged(
+      const std::string &interface,
+      const DBusPropertiesMap &properties,
+      const std::vector<std::string> &invalidated_properties);
+  virtual bool AllowRoaming();
 
  protected:
   virtual void InitProxies();
@@ -77,8 +81,6 @@
   virtual void OnConnectReply(const ResultCallback &callback,
                               const Error &error);
 
-  virtual bool AllowRoaming();
-
  private:
   friend class CellularTest;
   friend class CellularCapabilityGSMTest;
@@ -102,7 +104,7 @@
   FRIEND_TEST(CellularCapabilityGSMTest, SetHomeProvider);
   FRIEND_TEST(CellularCapabilityGSMTest, UpdateOperatorInfo);
   FRIEND_TEST(CellularCapabilityGSMTest, GetRegistrationState);
-  FRIEND_TEST(CellularCapabilityGSMTest, OnModemManagerPropertiesChanged);
+  FRIEND_TEST(CellularCapabilityGSMTest, OnDBusPropertiesChanged);
   FRIEND_TEST(CellularCapabilityGSMTest, SetupApnTryList);
   FRIEND_TEST(CellularCapabilityTest, AllowRoaming);
   FRIEND_TEST(CellularCapabilityTest, TryApns);