commit 3426c8fc7a3943f2d8fcb2ec78f0593088b42bed
author Thieu Le <thieule@chromium.org> Wed Jan 11 17:35:11 2012 -0800
committer Gerrit <chrome-bot@google.com> Fri Jan 13 15:08:15 2012 -0800
tree c56200177f3ad865d1b828d0fb40eeb2952efb67
parent d78ee7e07da6a78b0ad72b97c6737084d96428e7

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>

modem_info_unittest.cc

diff --git a/modem_info_unittest.cc b/modem_info_unittest.cc
index ff7c71c..a53b7cb 100644
--- a/modem_info_unittest.cc
+++ b/modem_info_unittest.cc
@@ -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/mock_control.h"
 #include "shill/mock_glib.h"
 #include "shill/mock_manager.h"
+#include "shill/mock_metrics.h"
 #include "shill/modem_info.h"
 #include "shill/modem_manager.h"
 
@@ -22,8 +23,9 @@
 class ModemInfoTest : public Test {
  public:
   ModemInfoTest()
-      : manager_(&control_interface_, &dispatcher_, &glib_),
-        modem_info_(&control_interface_, &dispatcher_, &manager_, &glib_) {}
+      : manager_(&control_interface_, &dispatcher_, &metrics_, &glib_),
+        modem_info_(&control_interface_, &dispatcher_, &metrics_, &manager_,
+                    &glib_) {}
 
  protected:
   static const char kTestMobileProviderDBPath[];
@@ -31,6 +33,7 @@
   MockGLib glib_;
   MockControl control_interface_;
   EventDispatcher dispatcher_;
+  MockMetrics metrics_;
   MockManager manager_;
   ModemInfo modem_info_;
 };