Moved scoped_histogram_timer to the main histogram_macros.h.

base/metrics/histogram_macros_unittest.cc

Index: base/metrics/histogram_macros_unittest.cc
diff --git a/media/base/scoped_histogram_timer_unittest.cc b/base/metrics/histogram_macros_unittest.cc
similarity index 67%
rename from media/base/scoped_histogram_timer_unittest.cc
rename to base/metrics/histogram_macros_unittest.cc
index 47e228eb1113cba8c29d919cd66854b580b19848..accff1df9dc86444de46ba02e408f08c0709fa41 100644
--- a/media/base/scoped_histogram_timer_unittest.cc
+++ b/base/metrics/histogram_macros_unittest.cc
@@ -1,16 +1,16 @@
-// Copyright 2013 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 "base/time/time.h"
-#include "media/base/scoped_histogram_timer.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace media {
-
-TEST(ScopedHistogramTimer, TwoTimersOneScope) {
-  SCOPED_UMA_HISTOGRAM_TIMER("TestTimer0");
-  SCOPED_UMA_HISTOGRAM_TIMER("TestTimer1");
-}
-
-}  // namespace media
+// Copyright 2015 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 "base/metrics/histogram_macros.h"
+#include "base/time/time.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace base {
+
+TEST(ScopedHistogramTimer, TwoTimersOneScope) {
+  SCOPED_UMA_HISTOGRAM_TIMER("TestTimer0");
+  SCOPED_UMA_HISTOGRAM_TIMER("TestTimer1");
+}
+
+}  // namespace base