shill: remove Network.Shill.CellularDropsPerHour metric
This metric can't be too important, because nobody noticed it was
missing from histograms.xml (and hence, not viewable in the metrics
dashboard).
Also, a per-hour metric can be misleading, because it doesn't account
for what fraction of the hour the device was actually trying to use
Cellular.
This commit sort-of reverts 6c1e3bbc, but it leaves some of the
hooks of that commit in place. In particular, metrics still takes
an EventDispatcher pointer in its ctor, so that it can report
periodic statistics. While there aren't presently any other periodic
statistics, it's easier to leave these hooks in place than to rip
them out.
BUG=chromium:274640
TEST=unit tests
Change-Id: I7ad88e2e2dd54935f4d8f743203802612eed52df
Reviewed-on: https://gerrit.chromium.org/gerrit/66123
Commit-Queue: mukesh agrawal <quiche@chromium.org>
Reviewed-by: mukesh agrawal <quiche@chromium.org>
Tested-by: mukesh agrawal <quiche@chromium.org>
diff --git a/metrics.h b/metrics.h
index 18471a4..f0af7aa 100644
--- a/metrics.h
+++ b/metrics.h
@@ -553,8 +553,7 @@
// Notifies this object that a cellular device has been dropped by the
// network.
- void NotifyCellularDeviceDrop(int interface_index,
- const std::string &network_technology,
+ void NotifyCellularDeviceDrop(const std::string &network_technology,
uint16 signal_strength);
// Notifies this object about 3GPP registration drop events.
@@ -609,7 +608,7 @@
ServiceMetricsLookupMap;
struct DeviceMetrics {
- DeviceMetrics() : auto_connect_tries(0), num_drops(0) {}
+ DeviceMetrics() : auto_connect_tries(0) {}
Technology::Identifier technology;
scoped_ptr<chromeos_metrics::TimerReporter> initialization_timer;
scoped_ptr<chromeos_metrics::TimerReporter> enable_timer;
@@ -619,7 +618,6 @@
scoped_ptr<chromeos_metrics::TimerReporter> scan_connect_timer;
scoped_ptr<chromeos_metrics::TimerReporter> auto_connect_timer;
int auto_connect_tries;
- int num_drops;
};
typedef std::map<const int, std::tr1::shared_ptr<DeviceMetrics> >
DeviceMetricsLookupMap;
@@ -639,8 +637,6 @@
static const uint16 kWiFiFrequency5745;
static const uint16 kWiFiFrequency5825;
- static const int kHourlyTimeoutMilliseconds;
-
void InitializeCommonServiceMetrics(const Service *service);
void UpdateServiceStateTransitionMetrics(ServiceMetrics *service_metrics,
Service::ConnectState new_state);
@@ -649,8 +645,6 @@
DeviceMetrics *GetDeviceMetrics(int interface_index) const;
void AutoConnectMetricsReset(DeviceMetrics *device_metrics);
- void HourlyTimeoutHandler();
-
// For unit test purposes.
void set_library(MetricsLibraryInterface *library);
void set_time_online_timer(chromeos_metrics::Timer *timer) {
@@ -697,7 +691,6 @@
scoped_ptr<chromeos_metrics::Timer> time_termination_actions_timer;
bool collect_bootstats_;
DeviceMetricsLookupMap devices_metrics_;
- base::CancelableClosure hourly_timeout_handler_;
DISALLOW_COPY_AND_ASSIGN(Metrics);
};