Merge M54: "Allow suspension prior to reaching kHaveFutureData."

content/renderer/media/renderer_webmediaplayer_delegate_browsertest.cc

 // Copyright 2016 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 <tuple>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/run_loop.h"
@@ skipping 163 matching lines @@
 
 TEST_F(RendererWebMediaPlayerDelegateTest, IdleDelegatesAreSuspended) {
   // Start the tick clock off at a non-null value.
   base::SimpleTestTickClock tick_clock;
   tick_clock.Advance(base::TimeDelta::FromSeconds(1234));
 
   const base::TimeDelta kIdleTimeout = base::TimeDelta::FromSeconds(2);
   delegate_manager_->SetIdleCleanupParamsForTesting(kIdleTimeout, &tick_clock);
   EXPECT_FALSE(delegate_manager_->IsIdleCleanupTimerRunningForTesting());
 
-  // Just adding an observer should not start the idle timer.
+  // Just adding an observer should start the idle timer.
   testing::StrictMock<MockWebMediaPlayerDelegateObserver> observer_1;
   const int delegate_id_1 = delegate_manager_->AddObserver(&observer_1);
-  EXPECT_FALSE(delegate_manager_->IsIdleCleanupTimerRunningForTesting());
+  EXPECT_TRUE(delegate_manager_->IsIdleCleanupTimerRunningForTesting());
 
   // Starting playback should not have an idle timer.
   delegate_manager_->DidPlay(delegate_id_1, true, true, false,
                              base::TimeDelta());
   EXPECT_FALSE(delegate_manager_->IsIdleCleanupTimerRunningForTesting());
 
   // Never calling DidPlay() but calling DidPause() should count as idle.
   testing::StrictMock<MockWebMediaPlayerDelegateObserver> observer_2;
   const int delegate_id_2 = delegate_manager_->AddObserver(&observer_2);
   delegate_manager_->DidPause(delegate_id_2, false);
@@ skipping 63 matching lines @@
   // Start the tick clock off at a non-null value.
   base::SimpleTestTickClock tick_clock;
   tick_clock.Advance(base::TimeDelta::FromSeconds(1234));
 
   const base::TimeDelta kIdleTimeout = base::TimeDelta::FromSeconds(2);
   delegate_manager_->SetIdleCleanupParamsForTesting(kIdleTimeout, &tick_clock);
   EXPECT_FALSE(delegate_manager_->IsIdleCleanupTimerRunningForTesting());
 
   testing::StrictMock<MockWebMediaPlayerDelegateObserver> observer_1;
   const int delegate_id_1 = delegate_manager_->AddObserver(&observer_1);
-  EXPECT_FALSE(delegate_manager_->IsIdleCleanupTimerRunningForTesting());
+  EXPECT_TRUE(delegate_manager_->IsIdleCleanupTimerRunningForTesting());
 
   // Calling DidPause() should instantly queue the timeout task.
   delegate_manager_->DidPause(delegate_id_1, false);
   EXPECT_TRUE(delegate_manager_->IsIdleCleanupTimerRunningForTesting());
 
   // Wait for the suspend request, but don't call PlayerGone().
-  EXPECT_CALL(observer_1, OnSuspendRequested(false));
+  EXPECT_CALL(observer_1, OnSuspendRequested(false)).Times(testing::AtLeast(1));
   base::RunLoop run_loop;
   base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
                                                 run_loop.QuitClosure());
   tick_clock.Advance(kIdleTimeout + base::TimeDelta::FromMicroseconds(1));
   run_loop.Run();
 
   // Even though the player did not call PlayerGone() it should be removed from
   // future idle cleanup polls.
   EXPECT_FALSE(delegate_manager_->IsIdleCleanupTimerRunningForTesting());
   delegate_manager_->RemoveObserver(delegate_id_1);
@@ skipping 36 matching lines @@
       delegate_id, false, true, false, base::TimeDelta());
   EXPECT_FALSE(HasPlayingVideo(delegate_id));
 
   // Removing the observer also removes the video from the set.
   delegate_manager_->DidPlay(delegate_id, true, true, false, base::TimeDelta());
   delegate_manager_->RemoveObserver(delegate_id);
   EXPECT_FALSE(HasPlayingVideo(delegate_id));
 }
 
 TEST_F(RendererWebMediaPlayerDelegateTest, IsPlayingBackgroundVideo) {
-  MockWebMediaPlayerDelegateObserver observer;
+  testing::NiceMock<MockWebMediaPlayerDelegateObserver> observer;
   int delegate_id = delegate_manager_->AddObserver(&observer);
   EXPECT_FALSE(delegate_manager_->IsPlayingBackgroundVideo());
 
   // Showing the frame always clears the flag.
   SetPlayingBackgroundVideo(true);
   delegate_manager_->WasShown();
   EXPECT_FALSE(delegate_manager_->IsPlayingBackgroundVideo());
 
   // Pausing anything other than a local playing video doesn't affect the flag.
   SetPlayingBackgroundVideo(true);
@@ skipping 17 matching lines @@
 
   delegate_manager_->DidPlay(
       delegate_id, true, true, false, base::TimeDelta());
   CallOnMediaDelegatePlay(delegate_id);
   EXPECT_NE(old_value, delegate_manager_->IsPlayingBackgroundVideo());
 }
 
 #if defined(OS_ANDROID)
 
 TEST_F(RendererWebMediaPlayerDelegateTest, Histograms) {
-  MockWebMediaPlayerDelegateObserver observer;
+  testing::NiceMock<MockWebMediaPlayerDelegateObserver> observer;
   int delegate_id = delegate_manager_->AddObserver(&observer);
   base::HistogramTester histogram_tester;
   histogram_tester.ExpectTotalCount("Media.Android.BackgroundVideoTime", 0);
 
   // Pausing or showing doesn't record anything as background playback
   // hasn't started yet.
   delegate_manager_->DidPlay(
       delegate_id, true, true, false, base::TimeDelta());
   CallOnMediaDelegatePause(delegate_id);
   histogram_tester.ExpectTotalCount("Media.Android.BackgroundVideoTime", 0);
@@ skipping 14 matching lines @@
   delegate_manager_->DidPlay(
       delegate_id, true, true, false, base::TimeDelta());
   SetPlayingBackgroundVideo(true);
   delegate_manager_->WasShown();
   histogram_tester.ExpectTotalCount("Media.Android.BackgroundVideoTime", 2);
 }
 
 #endif  // OS_ANDROID
 
 }  // namespace media