cashew: don't propagate inactive plans to clients

src/data_plan.h

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// TODO(vlaviano): update accessor style (GetFoo/SetFoo -> foo)
+
 #ifndef SRC_DATA_PLAN_H_
 #define SRC_DATA_PLAN_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include <base/basictypes.h>  // NOLINT
 #include <base/time.h>  // NOLINT
 #include <dbus-c++/dbus.h>  // NOLINT
@@ skipping 56 matching lines @@
     // get plan used bytes
     virtual Bytes GetDataBytesUsed() const;
 
     // get local used bytes
     virtual Bytes GetLocalBytesUsed() const;
 
     // set local used bytes
     // must be >= 0
     virtual void SetLocalBytesUsed(Bytes local_bytes_used);
 
+    // get total used bytes
+    virtual Bytes GetTotalBytesUsed() const;
+
     // is this an active plan?
     // we define active to mean that the plan is current and not exhausted
     virtual bool IsActive() const;
 
     // return a{sv} representation for D-Bus
     virtual DBusDataPlan ToDBusFormat() const;
 
     // construct DataPlan from DictionaryValue
     static DataPlan* FromDictionaryValue(const DictionaryValue *value,
                                          const Policy *policy);
@@ skipping 31 matching lines @@
     const Bytes data_bytes_max_;
 
     // bytes consumed so far during plan period
     // this measurement comes from the carrier API
     Bytes data_bytes_used_;
 
     // local measurement of bytes used since we received |data_bytes_used_|
     // baseline from the carrier API
     Bytes local_bytes_used_;
 
+    // our best estimate of total bytes used for this plan
+    // carrier baseline (|data_bytes_used_|) +
+    // locally measured traffic (|local_bytes_used_|)
+    Bytes total_bytes_used_;
+
     // convert plan type enum value to string formatted for libcros
     const char* TypeToLibcrosString(Type type) const;
 
     // convert string formatted for Cros Usage API to plan type enum value
     // returns true on success and false on failure
     // |type_out| must not be NULL and is set on a successful return
     static bool CrosUsageStringToType(const std::string& type_string,
                                       Type *type_out);
 
     // converts the value associated with |key| in |dict| to an int64
     // returns true on success and false on failure
     // |out_value| must not be NULL and is set on a successful return
     static bool GetInt64FromDictionary(const DictionaryValue& dict,
                                        const std::string& key,
                                        int64* out_value);
 
     DISALLOW_COPY_AND_ASSIGN(DataPlan);
 };
 
 }  // namespace cashew
 
 #endif  // SRC_DATA_PLAN_H_