Remove another duplicate definition of MonotonicClockNow.

In https://chromium-review.googlesource.com/c/chromium/src/+/1771053 I
missed one recently-added case.

Test: cast_media_unittests passes
Bug: b/139928913
Change-Id: Ifcaa595d16bd66b5cf745220ac6c96f87ea04907
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1779174
Auto-Submit: Antonio Rivera <antoniori@google.com>
Commit-Queue: Yuchen Liu <yucliu@chromium.org>
Reviewed-by: Yuchen Liu <yucliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#692237}

chromecast/media/audio/BUILD.gn

@@ -34,6 +34,7 @@ cast_source_set("audio") {
     "//chromecast/media/audio/mixer_service:connection",
     "//chromecast/media/audio/mixer_service:proto",
     "//chromecast/media/base",
+    "//chromecast/media/base:monotonic_clock",
     "//chromecast/media/cma/backend",
     "//chromecast/media/cma/base",
     "//chromecast/public/media",
@@ -98,7 +99,6 @@ buildflag_header("audio_buildflags") {
   header = "audio_buildflags.h"
 
   flags = [
-    "MEDIA_CLOCK_MONOTONIC_RAW=$media_clock_monotonic_raw",
     "MINIMUM_OUTPUT_BUFFER_SIZE_IN_FRAMES=$minimum_output_buffer_size_in_frames",
     "MAXIMUM_OUTPUT_BUFFER_SIZE_IN_FRAMES=$maximum_output_buffer_size_in_frames",
     "DEFAULT_OUTPUT_BUFFER_SIZE_IN_FRAMES=$default_output_buffer_size_in_frames",

chromecast/media/audio/cast_audio_output_stream.cc

@@ -14,17 +14,17 @@
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
-#include "base/synchronization/lock.h"
 #include "base/message_loop/message_pump_type.h"
+#include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chromecast/base/bind_to_task_runner.h"
 #include "chromecast/base/metrics/cast_metrics_helper.h"
 #include "chromecast/common/mojom/constants.mojom.h"
-#include "chromecast/media/audio/audio_buildflags.h"
 #include "chromecast/media/audio/cast_audio_manager.h"
 #include "chromecast/media/audio/mixer_service/mixer_service.pb.h"
 #include "chromecast/media/audio/mixer_service/mixer_service_connection.h"
+#include "chromecast/media/base/monotonic_clock.h"
 #include "chromecast/media/cma/backend/cma_backend_factory.h"
 #include "chromecast/public/cast_media_shlib.h"
 #include "chromecast/public/media/decoder_config.h"
@@ -64,16 +64,6 @@ namespace chromecast {
 namespace media {
 namespace {
 
-int64_t MonotonicClockNow() {
-  timespec now = {0, 0};
-#if BUILDFLAG(MEDIA_CLOCK_MONOTONIC_RAW)
-  clock_gettime(CLOCK_MONOTONIC_RAW, &now);
-#else
-  clock_gettime(CLOCK_MONOTONIC, &now);
-#endif  // BUILDFLAG(MEDIA_CLOCK_MONOTONIC_RAW)
-  return static_cast<int64_t>(now.tv_sec) * 1000000 + now.tv_nsec / 1000;
-}
-
 AudioContentType GetContentType(const std::string& device_id) {
   if (::media::AudioDeviceDescription::IsCommunicationsDevice(device_id)) {
     return AudioContentType::kCommunication;