shill: Supply home provider and serving operator for CDMA.

The Cellular::Operator classed is modeled after the Cellular::Network class.

BUG=chromium-os:19424
TEST=unit tests, tested on device

Change-Id: I464accd0f54318082c55ed50e879c6e229428d07
Reviewed-on: http://gerrit.chromium.org/gerrit/6402
Tested-by: Darin Petkov <petkov@chromium.org>
Reviewed-by: Chris Masone <cmasone@chromium.org>
diff --git a/cellular_service.h b/cellular_service.h
index a16b1bb..9f58c74 100644
--- a/cellular_service.h
+++ b/cellular_service.h
@@ -10,6 +10,7 @@
 
 #include <base/basictypes.h>
 
+#include "shill/cellular.h"
 #include "shill/refptr_types.h"
 #include "shill/service.h"
 
@@ -46,13 +47,15 @@
   const std::string &usage_url() const { return usage_url_; }
   void set_usage_url(const std::string &url) { usage_url_ = url; }
 
+  const Cellular::Operator &serving_operator() const;
+  void set_serving_operator(const Cellular::Operator &oper);
+
  protected:
   virtual std::string CalculateState() { return "idle"; }
 
   // Properties
   std::string activation_state_;
-  std::string operator_name_;
-  std::string operator_code_;
+  Cellular::Operator serving_operator_;
   std::string network_tech_;
   std::string roaming_state_;
   std::string payment_url_;