Moved scoped_histogram_timer to the main histogram_macros.h.

media/base/BUILD.gn

 # 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.
 
 import("//build/config/android/config.gni")
 import("//build/config/arm.gni")
 import("//build/config/ui.gni")
 import("//build/config/linux/pkg_config.gni")
 import("//media/media_options.gni")
 
@@ skipping 314 matching lines @@
     "data_buffer_unittest.cc",
     "decoder_buffer_queue_unittest.cc",
     "decoder_buffer_unittest.cc",
     "djb2_unittest.cc",
     "gmock_callback_support_unittest.cc",
     "key_systems_unittest.cc",
     "multi_channel_resampler_unittest.cc",
     "pipeline_unittest.cc",
     "ranges_unittest.cc",
     "run_all_unittests.cc",
-    "scoped_histogram_timer_unittest.cc",
     "serial_runner_unittest.cc",
     "seekable_buffer_unittest.cc",
     "sinc_resampler_unittest.cc",
     "stream_parser_unittest.cc",
     "text_ranges_unittest.cc",
     "text_renderer_unittest.cc",
     "user_input_monitor_unittest.cc",
     "vector_math_testing.h",
     "vector_math_unittest.cc",
     "video_frame_unittest.cc",
@@ skipping 122 matching lines @@
       if (is_posix) {
         yasm_flags += [ "-DELF" ]
         if (cpu_arch == "x64") {
           # TODO(ajwong): Why isn't this true in mac?
           yasm_flags += [ "-DPIC" ]
         }
       }
     }
   }
 }