shill: Putting UMA metrics in a separate nl80211 callback.
BUG=chromium-os:35466
TEST=Manual and unit tests.
Change-Id: I908f887a7ff3ce4d0bf33f1096cd61155c20e14a
Reviewed-on: https://gerrit.chromium.org/gerrit/35963
Reviewed-by: Paul Stewart <pstew@chromium.org>
Commit-Ready: Wade Guthrie <wdg@google.com>
Tested-by: Wade Guthrie <wdg@google.com>
diff --git a/shill_daemon.h b/shill_daemon.h
index 681d0ef..9232c2a 100644
--- a/shill_daemon.h
+++ b/shill_daemon.h
@@ -14,10 +14,10 @@
#include "shill/manager.h"
#include "shill/metrics.h"
#include "shill/sockets.h"
+#include "shill/callback80211_metrics.h"
namespace shill {
-class Callback80211Object;
class Config;
class Config80211;
class ControlInterface;
@@ -62,8 +62,8 @@
RoutingTable *routing_table_;
DHCPProvider *dhcp_provider_;
Config80211 *config80211_;
- Callback80211Object *callback80211_;
scoped_ptr<Manager> manager_;
+ Callback80211Metrics callback80211_metrics_;
EventDispatcher dispatcher_;
Sockets sockets_;
GLib glib_;