Switch GetWallClockTime to using vectors for input and output.

media/base/wall_clock_time_source.h

 // 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.
 
 #ifndef MEDIA_BASE_WALL_CLOCK_TIME_SOURCE_H_
 #define MEDIA_BASE_WALL_CLOCK_TIME_SOURCE_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
+#include "base/time/default_tick_clock.h"
 #include "media/base/media_export.h"
 #include "media/base/time_source.h"
 
-namespace base {
-class TickClock;
-}
-
 namespace media {
 
 // A time source that uses interpolation based on the system clock.
 class MEDIA_EXPORT WallClockTimeSource : public TimeSource {
  public:
   WallClockTimeSource();
   ~WallClockTimeSource() override;
 
   // TimeSource implementation.
   void StartTicking() override;
   void StopTicking() override;
   void SetPlaybackRate(double playback_rate) override;
   void SetMediaTime(base::TimeDelta time) override;
   base::TimeDelta CurrentMediaTime() override;
-  base::TimeTicks GetWallClockTime(base::TimeDelta time) override;
+  bool GetWallClockTime(
+      const std::vector<base::TimeDelta>& media_timestamps,
+      std::vector<base::TimeTicks>* wall_clock_times) override;
 
-  void SetTickClockForTesting(scoped_ptr<base::TickClock> tick_clock);
+  void set_tick_clock_for_testing(base::TickClock* tick_clock) {

[DaleCurtis, 2015/05/12 01:32:34]

Required for use in VideoRendererImpl unittest since another class is already
supposed to be the TickClock owner.

+    tick_clock_ = tick_clock;
+  }
 
  private:
   base::TimeDelta CurrentMediaTime_Locked();
 
-  scoped_ptr<base::TickClock> tick_clock_;
+  // Allow for an injectable tick clock for testing.
+  base::DefaultTickClock default_tick_clock_;
+
+  // If specified, used instead of |default_tick_clock_|.
+  base::TickClock* tick_clock_;
+
   bool ticking_;
 
   // While ticking we can interpolate the current media time by measuring the
   // delta between our reference ticks and the current system ticks and scaling
   // that time by the playback rate.
   double playback_rate_;
   base::TimeDelta base_time_;
   base::TimeTicks reference_wall_ticks_;
 
   // TODO(scherkus): Remove internal locking from this class after access to
   // Renderer::CurrentMediaTime() is single threaded http://crbug.com/370634
   base::Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(WallClockTimeSource);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_WALL_CLOCK_TIME_SOURCE_H_