Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(125)

Side by Side Diff: media/blink/webmediaplayer_impl_unittest.cc

Issue 2773573003: Don't GONE the unsuspended video only players (Closed)
Patch Set: Fixed the unittest Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/blink/webmediaplayer_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/blink/webmediaplayer_impl.h" 5 #include "media/blink/webmediaplayer_impl.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <memory> 9 #include <memory>
10 10
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 SetMetadata(true, true); 436 SetMetadata(true, true);
437 SetReadyState(blink::WebMediaPlayer::ReadyStateHaveFutureData); 437 SetReadyState(blink::WebMediaPlayer::ReadyStateHaveFutureData);
438 SetPaused(false); 438 SetPaused(false);
439 WebMediaPlayerImpl::PlayState state = ComputePlayState(); 439 WebMediaPlayerImpl::PlayState state = ComputePlayState();
440 EXPECT_EQ(WebMediaPlayerImpl::DelegateState::PLAYING, state.delegate_state); 440 EXPECT_EQ(WebMediaPlayerImpl::DelegateState::PLAYING, state.delegate_state);
441 EXPECT_FALSE(state.is_idle); 441 EXPECT_FALSE(state.is_idle);
442 EXPECT_FALSE(state.is_suspended); 442 EXPECT_FALSE(state.is_suspended);
443 EXPECT_TRUE(state.is_memory_reporting_enabled); 443 EXPECT_TRUE(state.is_memory_reporting_enabled);
444 } 444 }
445 445
446 TEST_F(WebMediaPlayerImplTest, ComputePlayState_PlayingVideoOnly) {
447 InitializeWebMediaPlayerImpl();
448 SetMetadata(false, true);
449 SetReadyState(blink::WebMediaPlayer::ReadyStateHaveFutureData);
450 SetPaused(false);
451 WebMediaPlayerImpl::PlayState state = ComputePlayState();
452 EXPECT_EQ(WebMediaPlayerImpl::DelegateState::PLAYING, state.delegate_state);
453 EXPECT_FALSE(state.is_idle);
454 EXPECT_FALSE(state.is_suspended);
455 EXPECT_TRUE(state.is_memory_reporting_enabled);
456 }
457
446 TEST_F(WebMediaPlayerImplTest, ComputePlayState_Underflow) { 458 TEST_F(WebMediaPlayerImplTest, ComputePlayState_Underflow) {
447 InitializeWebMediaPlayerImpl(); 459 InitializeWebMediaPlayerImpl();
448 SetMetadata(true, true); 460 SetMetadata(true, true);
449 SetReadyState(blink::WebMediaPlayer::ReadyStateHaveFutureData); 461 SetReadyState(blink::WebMediaPlayer::ReadyStateHaveFutureData);
450 SetPaused(false); 462 SetPaused(false);
451 SetReadyState(blink::WebMediaPlayer::ReadyStateHaveCurrentData); 463 SetReadyState(blink::WebMediaPlayer::ReadyStateHaveCurrentData);
452 WebMediaPlayerImpl::PlayState state = ComputePlayState(); 464 WebMediaPlayerImpl::PlayState state = ComputePlayState();
453 EXPECT_EQ(WebMediaPlayerImpl::DelegateState::PLAYING, state.delegate_state); 465 EXPECT_EQ(WebMediaPlayerImpl::DelegateState::PLAYING, state.delegate_state);
454 EXPECT_FALSE(state.is_idle); 466 EXPECT_FALSE(state.is_idle);
455 EXPECT_FALSE(state.is_suspended); 467 EXPECT_FALSE(state.is_suspended);
(...skipping 29 matching lines...) Expand all
485 497
486 TEST_F(WebMediaPlayerImplTest, ComputePlayState_FrameHiddenSuspendNoResume) { 498 TEST_F(WebMediaPlayerImplTest, ComputePlayState_FrameHiddenSuspendNoResume) {
487 SetUpMediaSuspend(true); 499 SetUpMediaSuspend(true);
488 base::test::ScopedFeatureList scoped_feature_list; 500 base::test::ScopedFeatureList scoped_feature_list;
489 scoped_feature_list.InitAndDisableFeature(kResumeBackgroundVideo); 501 scoped_feature_list.InitAndDisableFeature(kResumeBackgroundVideo);
490 502
491 InitializeWebMediaPlayerImpl(); 503 InitializeWebMediaPlayerImpl();
492 SetMetadata(true, true); 504 SetMetadata(true, true);
493 SetReadyState(blink::WebMediaPlayer::ReadyStateHaveFutureData); 505 SetReadyState(blink::WebMediaPlayer::ReadyStateHaveFutureData);
494 SetPaused(false); 506 SetPaused(false);
507 WebMediaPlayerImpl::PlayState state = ComputePlayState_FrameHidden();
508 EXPECT_EQ(WebMediaPlayerImpl::DelegateState::PLAYING, state.delegate_state);
509 EXPECT_FALSE(state.is_idle);
510 EXPECT_FALSE(state.is_suspended);
511 EXPECT_TRUE(state.is_memory_reporting_enabled);
495 512
496 WebMediaPlayerImpl::PlayState state = ComputePlayState_FrameHidden(); 513 SetPaused(true);
514 state = ComputePlayState_FrameHidden();
497 EXPECT_EQ(WebMediaPlayerImpl::DelegateState::GONE, state.delegate_state); 515 EXPECT_EQ(WebMediaPlayerImpl::DelegateState::GONE, state.delegate_state);
498 EXPECT_TRUE(state.is_idle); 516 EXPECT_TRUE(state.is_idle);
499 EXPECT_FALSE(state.is_suspended); 517 EXPECT_TRUE(state.is_suspended);
500 EXPECT_TRUE(state.is_memory_reporting_enabled); 518 EXPECT_FALSE(state.is_memory_reporting_enabled);
501 } 519 }
502 520
503 TEST_F(WebMediaPlayerImplTest, ComputePlayState_FrameHiddenSuspendWithResume) { 521 TEST_F(WebMediaPlayerImplTest, ComputePlayState_FrameHiddenSuspendWithResume) {
504 SetUpMediaSuspend(true); 522 SetUpMediaSuspend(true);
505 base::test::ScopedFeatureList scoped_feature_list; 523 base::test::ScopedFeatureList scoped_feature_list;
506 scoped_feature_list.InitAndEnableFeature(kResumeBackgroundVideo); 524 scoped_feature_list.InitAndEnableFeature(kResumeBackgroundVideo);
507 525
508 InitializeWebMediaPlayerImpl(); 526 InitializeWebMediaPlayerImpl();
509 SetMetadata(true, true); 527 SetMetadata(true, true);
510 SetReadyState(blink::WebMediaPlayer::ReadyStateHaveFutureData); 528 SetReadyState(blink::WebMediaPlayer::ReadyStateHaveFutureData);
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
877 895
878 INSTANTIATE_TEST_CASE_P(BackgroundBehaviorTestInstances, 896 INSTANTIATE_TEST_CASE_P(BackgroundBehaviorTestInstances,
879 WebMediaPlayerImplBackgroundBehaviorTest, 897 WebMediaPlayerImplBackgroundBehaviorTest,
880 ::testing::Combine(::testing::Bool(), 898 ::testing::Combine(::testing::Bool(),
881 ::testing::Bool(), 899 ::testing::Bool(),
882 ::testing::Values(5, 300), 900 ::testing::Values(5, 300),
883 ::testing::Values(5, 100), 901 ::testing::Values(5, 100),
884 ::testing::Bool())); 902 ::testing::Bool()));
885 903
886 } // namespace media 904 } // namespace media
OLDNEW
« no previous file with comments | « media/blink/webmediaplayer_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698