Make media::AudioRenderer inherit from media::TimeSource.

media/base/audio_renderer.h

Index: media/base/audio_renderer.h
diff --git a/media/base/audio_renderer.h b/media/base/audio_renderer.h
index 00a8e7f14ddd84b0163d93d03e9c3a6b63bc40c8..dc202be9a2dc68a641ae569edfdc0288eaf53e07 100644
--- a/media/base/audio_renderer.h
+++ b/media/base/audio_renderer.h
@@ -6,7 +6,6 @@
 #define MEDIA_BASE_AUDIO_RENDERER_H_
 
 #include "base/callback.h"
-#include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "media/base/buffering_state.h"
 #include "media/base/media_export.h"
@@ -15,6 +14,7 @@
 namespace media {
 
 class DemuxerStream;
+class TimeSource;
 
 class MEDIA_EXPORT AudioRenderer {
  public:
@@ -46,23 +46,8 @@ class MEDIA_EXPORT AudioRenderer {
                           const base::Closure& ended_cb,
                           const PipelineStatusCB& error_cb) = 0;
 
-  // Signal audio playback to start at the current rate. It is expected that
-  // |time_cb| will eventually start being run with time updates.
-  //
-  // TODO(scherkus): Fold into TimeSource API.
-  virtual void StartRendering() = 0;
-
-  // Signal audio playback to stop until further notice. It is expected that
-  // |time_cb| will no longer be run.
-  //
-  // TODO(scherkus): Fold into TimeSource API.
-  virtual void StopRendering() = 0;
-
-  // Sets the media time to start rendering from. Only valid to call while not
-  // currently rendering.
-  //
-  // TODO(scherkus): Fold into TimeSource API.
-  virtual void SetMediaTime(base::TimeDelta time) = 0;
+  // Returns the TimeSource associated with audio rendering.
+  virtual TimeSource* GetTimeSource() = 0;
 
   // Discard any audio data, executing |callback| when completed.
   //
@@ -79,11 +64,6 @@ class MEDIA_EXPORT AudioRenderer {
   // when complete.
   virtual void Stop(const base::Closure& callback) = 0;
 
-  // Updates the current playback rate.
-  //
-  // TODO(scherkus): Fold into TimeSource API.
-  virtual void SetPlaybackRate(float playback_rate) = 0;
-
   // Sets the output volume.
   virtual void SetVolume(float volume) = 0;