commit ac635a8fb539fd44f3e24c33872b61fd064c0d60
author Darin Petkov <petkov@chromium.org> Tue Jan 10 16:51:58 2012 +0100
committer Gerrit <chrome-bot@google.com> Wed Jan 11 16:22:30 2012 -0800
tree c7261513c97d35745f79aba664ca3f435fd16252
parent 2c3773810323292df11b8359ad3f368989f4884a

shill: Set the cellular service friendly name.

BUG=chromium-os:24897
TEST=unit tests, tested on device with GSM

Change-Id: I2fe803822f2ddc5c52daddcf625b3327f95563ad
Reviewed-on: https://gerrit.chromium.org/gerrit/13933
Commit-Ready: Darin Petkov <petkov@chromium.org>
Reviewed-by: Darin Petkov <petkov@chromium.org>
Tested-by: Darin Petkov <petkov@chromium.org>

cellular.h

diff --git a/cellular.h b/cellular.h
index 7551ad0..6ad9af5 100644
--- a/cellular.h
+++ b/cellular.h
@@ -119,6 +119,8 @@
 
   static std::string GetStateString(State state);
 
+  std::string CreateFriendlyServiceName();
+
   State state() const { return state_; }
 
   void set_modem_state(ModemState state) { modem_state_ = state; }
@@ -129,6 +131,8 @@
   const std::string &dbus_owner() const { return dbus_owner_; }
   const std::string &dbus_path() const { return dbus_path_; }
 
+  const std::string &carrier() const { return carrier_; }
+
   const Operator &home_provider() const { return home_provider_; }
   void set_home_provider(const Operator &oper);
 
@@ -179,6 +183,9 @@
   friend class CellularCapabilityCDMATest;
   friend class CellularCapabilityGSMTest;
   friend class ModemTest;
+  FRIEND_TEST(CellularCapabilityCDMATest, CreateFriendlyServiceName);
+  FRIEND_TEST(CellularCapabilityGSMTest, CreateFriendlyServiceName);
+  FRIEND_TEST(CellularServiceTest, FriendlyName);
   FRIEND_TEST(CellularTest, CreateService);
   FRIEND_TEST(CellularTest, Connect);
   FRIEND_TEST(CellularTest, GetModemInfo);