commit 381928f996d23a21d4cfbed70d07cbf9029f625d
author Darin Petkov <petkov@chromium.org> Thu Feb 02 23:00:12 2012 +0100
committer Gerrit <chrome-bot@google.com> Fri Feb 03 08:08:55 2012 -0800
tree b98bbd66985744ddd871bf3729ee33f15114c635
parent 0756db95c9d39d6e6aa9a754e54b441eff46ff34

shill: Broadcast OLP and Usage URL cellular service properties.

This patch also switches the deprecated string payment url property to the new
dict OLP property.

BUG=chromium-os:25612,chromium-os:25011
TEST=unit tests

Change-Id: I67beaafef936bb4f2e36d2a2faf14c1280eb70be
Reviewed-on: https://gerrit.chromium.org/gerrit/15202
Tested-by: Darin Petkov <petkov@chromium.org>
Reviewed-by: Eric Shienbrood <ers@chromium.org>
Commit-Ready: Darin Petkov <petkov@chromium.org>

cellular_service.h

diff --git a/cellular_service.h b/cellular_service.h
index a067973..6fbb741 100644
--- a/cellular_service.h
+++ b/cellular_service.h
@@ -24,6 +24,32 @@
 
 class CellularService : public Service {
  public:
+  // Online payment portal.
+  class OLP {
+   public:
+    OLP();
+    ~OLP();
+
+    void CopyFrom(const OLP &olp);
+    bool Equals(const OLP &olp) const;
+
+    const std::string &GetURL() const;
+    void SetURL(const std::string &url);
+
+    const std::string &GetMethod() const;
+    void SetMethod(const std::string &method);
+
+    const std::string &GetPostData() const;
+    void SetPostData(const std::string &post_data);
+
+    const Stringmap &ToDict() const;
+
+   private:
+    Stringmap dict_;
+
+    DISALLOW_COPY_AND_ASSIGN(OLP);
+  };
+
   CellularService(ControlInterface *control_interface,
                   EventDispatcher *dispatcher,
                   Metrics *metrics,
@@ -44,11 +70,11 @@
   void SetActivationState(const std::string &state);
   const std::string &activation_state() const { return activation_state_; }
 
-  const std::string &payment_url() const { return payment_url_; }
-  void set_payment_url(const std::string &url) { payment_url_ = url; }
+  void SetOLP(const OLP &olp);
+  const OLP &olp() const { return olp_; }
 
+  void SetUsageURL(const std::string &url);
   const std::string &usage_url() const { return usage_url_; }
-  void set_usage_url(const std::string &url) { usage_url_ = url; }
 
   void SetServingOperator(const Cellular::Operator &oper);
   const Cellular::Operator &serving_operator() const;
@@ -74,7 +100,7 @@
   Cellular::Operator serving_operator_;
   std::string network_technology_;
   std::string roaming_state_;
-  std::string payment_url_;
+  OLP olp_;
   std::string usage_url_;
 
   std::map<std::string, std::string> apn_info_;