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>

profile_unittest.cc

diff --git a/profile_unittest.cc b/profile_unittest.cc
index e7ab645..d7ef54f 100644
--- a/profile_unittest.cc
+++ b/profile_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.
 
@@ -41,6 +41,7 @@
   MockService *CreateMockService() {
     return new StrictMock<MockService>(control_interface(),
                                        dispatcher(),
+                                       metrics(),
                                        manager());
   }
 
@@ -180,6 +181,7 @@
 TEST_F(ProfileTest, ServiceConfigure) {
   ServiceRefPtr service1(new ServiceUnderTest(control_interface(),
                                               dispatcher(),
+                                              metrics(),
                                               manager()));
   service1->set_priority(service1->priority() + 1);  // Change from default.
   ASSERT_TRUE(profile_->AdoptService(service1));
@@ -189,6 +191,7 @@
   // service; ensure that settings from |service1| wind up in |service2|.
   ServiceRefPtr service2(new ServiceUnderTest(control_interface(),
                                               dispatcher(),
+                                              metrics(),
                                               manager()));
   int32 orig_priority = service2->priority();
   ASSERT_TRUE(profile_->ConfigureService(service2));