Make remaining parts of components/metrics use metrics namespace.

components/metrics/daily_event_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/metrics/daily_event.h"
 
 #include "base/prefs/testing_pref_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace metrics {
@@ skipping 20 matching lines @@
   bool fired_;
 
   DISALLOW_COPY_AND_ASSIGN(TestDailyObserver);
 };
 
 class DailyEventTest : public testing::Test {
  public:
   DailyEventTest() : event_(&prefs_, kTestPrefName, kTestMetricName) {
     DailyEvent::RegisterPref(prefs_.registry(), kTestPrefName);
     observer_ = new TestDailyObserver();
-    scoped_ptr<metrics::DailyEvent::Observer> p(observer_);
-    event_.AddObserver(p.Pass());
+    event_.AddObserver(make_scoped_ptr(observer_));
   }
 
  protected:
   TestingPrefServiceSimple prefs_;
   TestDailyObserver* observer_;
   DailyEvent event_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DailyEventTest);
 };
@@ skipping 32 matching lines @@
 
 // The event should not fire if the preference is less than a day in the future.
 TEST_F(DailyEventTest, TestSoonNotFired) {
   base::Time last_time = base::Time::Now() + base::TimeDelta::FromMinutes(2);
   prefs_.SetInt64(kTestPrefName, last_time.ToInternalValue());
   event_.CheckInterval();
   EXPECT_FALSE(observer_->fired());
 }
 
 }  // namespace metrics