Fixed const argument problem from previous commit. BUG=chromium-os:18816 TEST=ran unittests Change-Id: Iade85438677475d428a31f872ba55b522b945d26 Reviewed-on: http://gerrit.chromium.org/gerrit/6235 Reviewed-by: David Rochberg <rochberg@chromium.org> Reviewed-by: Vince Laviano <vlaviano@chromium.org> Tested-by: Anne Kenyon (Chromium) <annemkenyon@chromium.org>
diff --git a/introspection/cashew.xml b/introspection/cashew.xml index d930347..f9bd8e0 100644 --- a/introspection/cashew.xml +++ b/introspection/cashew.xml
@@ -122,7 +122,7 @@ <tp:docstring> Request cellular usage statistics </tp:docstring> - <arg name="usage" type="a{sx}" direction="in"> + <arg name="usage" type="a{sx}" direction="out"> <tp:docstring> Structure that maps dates to usage (in bytes) </tp:docstring>
diff --git a/src/aggregator.h b/src/aggregator.h index 5a393b3..46540db 100644 --- a/src/aggregator.h +++ b/src/aggregator.h
@@ -5,11 +5,11 @@ #ifndef SRC_AGGREGATOR_H_ #define SRC_AGGREGATOR_H_ -#include <base/basictypes.h> - #include <map> #include <string> +#include <base/basictypes.h> // NOLINT + namespace cashew { class Service; @@ -25,8 +25,10 @@ virtual void OnByteCounterUpdate(const Service *service, uint64 delta_rx_bytes, uint64 delta_tx_bytes) = 0; + // takes a map of strings to int64s and sets it to the dates for the past + // year and their corresponding byte count. virtual void GetBytesPerDay( - const std::map<std::string, int64_t>& day_usage)= 0; + std::map<std::string, int64_t>& day_usage)= 0; //NOLINT // factory static Aggregator* NewAggregator();
diff --git a/src/aggregator_impl.cc b/src/aggregator_impl.cc index 2cc19f9..d229013 100644 --- a/src/aggregator_impl.cc +++ b/src/aggregator_impl.cc
@@ -132,7 +132,7 @@ } void AggregatorImpl::GetBytesPerDay( - const std::map<std::string, int64_t>& day_usage) { + std::map<std::string, int64_t>& day_usage) { // NOLINT // TODO(mikemeko): fill this function to return whatever structure // contains our bytes per day info. }
diff --git a/src/aggregator_impl.h b/src/aggregator_impl.h index 7923518..ae4054e 100644 --- a/src/aggregator_impl.h +++ b/src/aggregator_impl.h
@@ -46,7 +46,7 @@ // returns a map of date strings to bytes used virtual void GetBytesPerDay( - const std::map<std::string, int64_t>& day_usage); + std::map<std::string, int64_t>& day_usage); // NOLINT private:
diff --git a/src/cashew_server.cc b/src/cashew_server.cc index 67a5098..97889b8 100644 --- a/src/cashew_server.cc +++ b/src/cashew_server.cc
@@ -70,7 +70,7 @@ } void CashewServer::RequestCellularUsageInfo( - const std::map<std::string, int64_t>& day_usage, + std::map<std::string, int64_t>& day_usage, DBus::Error& error) { // NOLINT LOG(INFO) << "RequestCellularUsageInfo called"; aggregator_->GetBytesPerDay(day_usage);
diff --git a/src/cashew_server.h b/src/cashew_server.h index ccdd27f..5640ff3 100644 --- a/src/cashew_server.h +++ b/src/cashew_server.h
@@ -48,7 +48,7 @@ // Called from Chrome when user wants usage information virtual void RequestCellularUsageInfo( - const std::map<std::string, int64_t>& day_usage, + std::map<std::string, int64_t>& day_usage, DBus::Error& error); // NOLINT // Test method to verify that Cashew service is working