Merge M54: "Clear reference time after SetMediaTime in video-only time source."

media/base/wall_clock_time_source_unittest.cc

 // 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.
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "media/base/wall_clock_time_source.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 71 matching lines @@
   EXPECT_EQ(100, CurrentMediaTimeInSeconds());
   EXPECT_TRUE(IsWallClockNowForMediaTimeInSeconds(100));
 }
 
 TEST_F(WallClockTimeSourceTest, SetMediaTime) {
   EXPECT_EQ(0, CurrentMediaTimeInSeconds());
   EXPECT_TRUE(IsTimeStopped());
   SetMediaTimeInSeconds(10);
   EXPECT_EQ(10, CurrentMediaTimeInSeconds());
   EXPECT_TRUE(IsTimeStopped());
+  std::vector<base::TimeTicks> wall_clock_times;
+  time_source_.GetWallClockTimes(std::vector<base::TimeDelta>(),
+                                 &wall_clock_times);
+  EXPECT_EQ(base::TimeTicks(), wall_clock_times[0]);
 }
 
 TEST_F(WallClockTimeSourceTest, SetPlaybackRate) {
   time_source_.StartTicking();
 
   time_source_.SetPlaybackRate(0.5);
   EXPECT_EQ(0, CurrentMediaTimeInSeconds());
   EXPECT_TRUE(IsWallClockNowForMediaTimeInSeconds(0));
   AdvanceTimeInSeconds(10);
   EXPECT_EQ(5, CurrentMediaTimeInSeconds());
@@ skipping 54 matching lines @@
       std::vector<base::TimeDelta>(), &wall_clock_times);
   EXPECT_TRUE(is_time_moving);
   EXPECT_EQ(tick_clock_->NowTicks(), wall_clock_times[0]);
 
   wall_clock_times.clear();
   time_source_.StopTicking();
   is_time_moving = time_source_.GetWallClockTimes(
       std::vector<base::TimeDelta>(), &wall_clock_times);
   EXPECT_FALSE(is_time_moving);
   EXPECT_EQ(tick_clock_->NowTicks(), wall_clock_times[0]);
+
+  // Setting media time should clear reference time.
+  SetMediaTimeInSeconds(5);
+  wall_clock_times.clear();
+  is_time_moving = time_source_.GetWallClockTimes(
+      std::vector<base::TimeDelta>(), &wall_clock_times);
+  EXPECT_FALSE(is_time_moving);
+  EXPECT_EQ(base::TimeTicks(), wall_clock_times[0]);
 }
 
 }  // namespace media