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/property_store_unittest.h b/property_store_unittest.h
index 9679aab..874716f 100644
--- a/property_store_unittest.h
+++ b/property_store_unittest.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.
@@ -21,6 +21,7 @@
#include "shill/manager.h"
#include "shill/mock_control.h"
#include "shill/mock_glib.h"
+#include "shill/mock_metrics.h"
#include "shill/property_store.h"
namespace shill {
@@ -54,6 +55,7 @@
MockControl *control_interface() { return &control_interface_; }
EventDispatcher *dispatcher() { return &dispatcher_; }
MockGLib *glib() { return &glib_; }
+ MockMetrics *metrics() { return &metrics_; }
const std::string &run_path() const { return path_; }
const std::string &storage_path() const { return path_; }
@@ -70,6 +72,7 @@
const std::string path_;
MockControl control_interface_;
EventDispatcher dispatcher_;
+ MockMetrics metrics_;
MockGLib glib_;
Manager manager_;
};