Moved scoped_histogram_timer to the main histogram_macros.h.

media/base/scoped_histogram_timer_unittest.cc

Index: media/base/scoped_histogram_timer_unittest.cc
diff --git a/media/base/scoped_histogram_timer_unittest.cc b/media/base/scoped_histogram_timer_unittest.cc
deleted file mode 100644
index 47e228eb1113cba8c29d919cd66854b580b19848..0000000000000000000000000000000000000000
--- a/media/base/scoped_histogram_timer_unittest.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-// 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