shill: Move Metrics from singleton to Shill daemon
While implementing chromium-os:24810, it was discovered that Metrics is
cleaner if it is passed around like ControlInterface, Dispatcher,
Manager, etc. This approach also makes Metrics more testable.
BUG=chromium-os:24810
TEST=Unit tests, network_WiFiManager suite
Change-Id: I556a1bd11f21f0b93ecfeaae8855dfb99ed5e5f9
Reviewed-on: https://gerrit.chromium.org/gerrit/14099
Commit-Ready: Thieu Le <thieule@chromium.org>
Reviewed-by: Thieu Le <thieule@chromium.org>
Tested-by: Thieu Le <thieule@chromium.org>
diff --git a/shill_daemon.h b/shill_daemon.h
index ef7a362..c0ff1cb 100644
--- a/shill_daemon.h
+++ b/shill_daemon.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -10,6 +10,7 @@
#include "shill/event_dispatcher.h"
#include "shill/glib.h"
#include "shill/manager.h"
+#include "shill/metrics.h"
#include "shill/sockets.h"
namespace shill {
@@ -38,6 +39,7 @@
Config *config_;
ControlInterface *control_;
+ Metrics metrics_;
Manager manager_;
EventDispatcher dispatcher_;
Sockets sockets_;