Switch GetWallClockTime to using vectors for input and output.

media/base/wall_clock_time_source_unittest.cc

Index: media/base/wall_clock_time_source_unittest.cc
diff --git a/media/base/wall_clock_time_source_unittest.cc b/media/base/wall_clock_time_source_unittest.cc
index fe8e04c1e82ad4460fa9c625106f13b39cb663bf..d9b632ffd2b187ba7c80a327d9808244c4e2bf9a 100644
--- a/media/base/wall_clock_time_source_unittest.cc
+++ b/media/base/wall_clock_time_source_unittest.cc
@@ -11,8 +11,7 @@ namespace media {
 class WallClockTimeSourceTest : public testing::Test {
  public:
   WallClockTimeSourceTest() : tick_clock_(new base::SimpleTestTickClock()) {
-    time_source_.SetTickClockForTesting(
-        scoped_ptr<base::TickClock>(tick_clock_));
+    time_source_.set_tick_clock_for_testing(tick_clock_.get());
     AdvanceTimeInSeconds(1);
   }
   ~WallClockTimeSourceTest() override {}
@@ -30,33 +29,41 @@ class WallClockTimeSourceTest : public testing::Test {
   }
 
   bool IsWallClockNowForMediaTimeInSeconds(int seconds) {
-    return tick_clock_->NowTicks() ==
-           time_source_.GetWallClockTime(base::TimeDelta::FromSeconds(seconds));
+    std::vector<base::TimeTicks> wall_clock_times;
+    EXPECT_TRUE(time_source_.GetWallClockTimes(
+        std::vector<base::TimeDelta>(1, base::TimeDelta::FromSeconds(seconds)),
+        &wall_clock_times));
+    return tick_clock_->NowTicks() == wall_clock_times.front();
   }
 
-  bool IsWallClockNullForMediaTimeInSeconds(int seconds) {
-    return time_source_.GetWallClockTime(base::TimeDelta::FromSeconds(seconds))
-        .is_null();
+  bool IsTimeStopped() {
+    std::vector<base::TimeTicks> wall_clock_times;
+    // Convert any random value, it shouldn't matter for this call.
+    const bool time_stopped = !time_source_.GetWallClockTimes(
+        std::vector<base::TimeDelta>(1, base::TimeDelta::FromSeconds(1)),
+        &wall_clock_times);
+    EXPECT_EQ(time_stopped, wall_clock_times.empty());
+    return time_stopped;
   }
 
  protected:
   WallClockTimeSource time_source_;
-  base::SimpleTestTickClock* tick_clock_;  // Owned by |time_source_|.
+  scoped_ptr<base::SimpleTestTickClock> tick_clock_;
 
   DISALLOW_COPY_AND_ASSIGN(WallClockTimeSourceTest);
 };
 
 TEST_F(WallClockTimeSourceTest, InitialTimeIsZero) {
   EXPECT_EQ(0, CurrentMediaTimeInSeconds());
-  EXPECT_TRUE(IsWallClockNullForMediaTimeInSeconds(0));
+  EXPECT_TRUE(IsTimeStopped());
 }
 
 TEST_F(WallClockTimeSourceTest, InitialTimeIsNotTicking) {
   EXPECT_EQ(0, CurrentMediaTimeInSeconds());
-  EXPECT_TRUE(IsWallClockNullForMediaTimeInSeconds(0));
+  EXPECT_TRUE(IsTimeStopped());
   AdvanceTimeInSeconds(100);
   EXPECT_EQ(0, CurrentMediaTimeInSeconds());
-  EXPECT_TRUE(IsWallClockNullForMediaTimeInSeconds(0));
+  EXPECT_TRUE(IsTimeStopped());
 }
 
 TEST_F(WallClockTimeSourceTest, InitialPlaybackRateIsOne) {
@@ -71,10 +78,10 @@ TEST_F(WallClockTimeSourceTest, InitialPlaybackRateIsOne) {
 
 TEST_F(WallClockTimeSourceTest, SetMediaTime) {
   EXPECT_EQ(0, CurrentMediaTimeInSeconds());
-  EXPECT_TRUE(IsWallClockNullForMediaTimeInSeconds(0));
+  EXPECT_TRUE(IsTimeStopped());
   SetMediaTimeInSeconds(10);
   EXPECT_EQ(10, CurrentMediaTimeInSeconds());
-  EXPECT_TRUE(IsWallClockNullForMediaTimeInSeconds(10));
+  EXPECT_TRUE(IsTimeStopped());
 }
 
 TEST_F(WallClockTimeSourceTest, SetPlaybackRate) {
@@ -108,7 +115,7 @@ TEST_F(WallClockTimeSourceTest, StopTicking) {
 
   AdvanceTimeInSeconds(10);
   EXPECT_EQ(10, CurrentMediaTimeInSeconds());
-  EXPECT_TRUE(IsWallClockNullForMediaTimeInSeconds(10));
+  EXPECT_TRUE(IsTimeStopped());
 }
 
 }  // namespace media