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

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

Issue 2767253002: Don't GONE the unsuspended video only players (Closed)
Patch Set: Fixed comments 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 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
460 SetMetadata(true, true); 460 SetMetadata(true, true);
461 SetReadyState(blink::WebMediaPlayer::ReadyStateHaveFutureData); 461 SetReadyState(blink::WebMediaPlayer::ReadyStateHaveFutureData);
462 SetPaused(false); 462 SetPaused(false);
463 WebMediaPlayerImpl::PlayState state = ComputePlayState(); 463 WebMediaPlayerImpl::PlayState state = ComputePlayState();
464 EXPECT_EQ(WebMediaPlayerImpl::DelegateState::PLAYING, state.delegate_state); 464 EXPECT_EQ(WebMediaPlayerImpl::DelegateState::PLAYING, state.delegate_state);
465 EXPECT_FALSE(state.is_idle); 465 EXPECT_FALSE(state.is_idle);
466 EXPECT_FALSE(state.is_suspended); 466 EXPECT_FALSE(state.is_suspended);
467 EXPECT_TRUE(state.is_memory_reporting_enabled); 467 EXPECT_TRUE(state.is_memory_reporting_enabled);
468 } 468 }
469 469
470 TEST_F(WebMediaPlayerImplTest, ComputePlayState_PlayingVideoOnly) {
471 InitializeWebMediaPlayerImpl(true);
472 SetMetadata(false, true);
473 SetReadyState(blink::WebMediaPlayer::ReadyStateHaveFutureData);
474 SetPaused(false);
475 WebMediaPlayerImpl::PlayState state = ComputePlayState();
476 EXPECT_EQ(WebMediaPlayerImpl::DelegateState::PLAYING, state.delegate_state);
477 EXPECT_FALSE(state.is_idle);
478 EXPECT_FALSE(state.is_suspended);
479 EXPECT_TRUE(state.is_memory_reporting_enabled);
480 }
481
470 TEST_F(WebMediaPlayerImplTest, ComputePlayState_Underflow) { 482 TEST_F(WebMediaPlayerImplTest, ComputePlayState_Underflow) {
471 InitializeWebMediaPlayerImpl(true); 483 InitializeWebMediaPlayerImpl(true);
472 SetMetadata(true, true); 484 SetMetadata(true, true);
473 SetReadyState(blink::WebMediaPlayer::ReadyStateHaveFutureData); 485 SetReadyState(blink::WebMediaPlayer::ReadyStateHaveFutureData);
474 SetPaused(false); 486 SetPaused(false);
475 SetReadyState(blink::WebMediaPlayer::ReadyStateHaveCurrentData); 487 SetReadyState(blink::WebMediaPlayer::ReadyStateHaveCurrentData);
476 WebMediaPlayerImpl::PlayState state = ComputePlayState(); 488 WebMediaPlayerImpl::PlayState state = ComputePlayState();
477 EXPECT_EQ(WebMediaPlayerImpl::DelegateState::PLAYING, state.delegate_state); 489 EXPECT_EQ(WebMediaPlayerImpl::DelegateState::PLAYING, state.delegate_state);
478 EXPECT_FALSE(state.is_idle); 490 EXPECT_FALSE(state.is_idle);
479 EXPECT_FALSE(state.is_suspended); 491 EXPECT_FALSE(state.is_suspended);
(...skipping 29 matching lines...) Expand all
509 521
510 TEST_F(WebMediaPlayerImplTest, ComputePlayState_FrameHiddenSuspendNoResume) { 522 TEST_F(WebMediaPlayerImplTest, ComputePlayState_FrameHiddenSuspendNoResume) {
511 SetUpMediaSuspend(true); 523 SetUpMediaSuspend(true);
512 base::test::ScopedFeatureList scoped_feature_list; 524 base::test::ScopedFeatureList scoped_feature_list;
513 scoped_feature_list.InitAndDisableFeature(kResumeBackgroundVideo); 525 scoped_feature_list.InitAndDisableFeature(kResumeBackgroundVideo);
514 526
515 InitializeWebMediaPlayerImpl(true); 527 InitializeWebMediaPlayerImpl(true);
516 SetMetadata(true, true); 528 SetMetadata(true, true);
517 SetReadyState(blink::WebMediaPlayer::ReadyStateHaveFutureData); 529 SetReadyState(blink::WebMediaPlayer::ReadyStateHaveFutureData);
518 SetPaused(false); 530 SetPaused(false);
531 WebMediaPlayerImpl::PlayState state = ComputePlayState_FrameHidden();
532 EXPECT_EQ(WebMediaPlayerImpl::DelegateState::PLAYING, state.delegate_state);
533 EXPECT_FALSE(state.is_idle);
534 EXPECT_FALSE(state.is_suspended);
535 EXPECT_TRUE(state.is_memory_reporting_enabled);
519 536
520 WebMediaPlayerImpl::PlayState state = ComputePlayState_FrameHidden(); 537 SetPaused(true);
538 state = ComputePlayState_FrameHidden();
521 EXPECT_EQ(WebMediaPlayerImpl::DelegateState::GONE, state.delegate_state); 539 EXPECT_EQ(WebMediaPlayerImpl::DelegateState::GONE, state.delegate_state);
522 EXPECT_TRUE(state.is_idle); 540 EXPECT_TRUE(state.is_idle);
523 EXPECT_FALSE(state.is_suspended); 541 EXPECT_TRUE(state.is_suspended);
524 EXPECT_TRUE(state.is_memory_reporting_enabled); 542 EXPECT_FALSE(state.is_memory_reporting_enabled);
525 } 543 }
526 544
527 TEST_F(WebMediaPlayerImplTest, ComputePlayState_FrameHiddenSuspendWithResume) { 545 TEST_F(WebMediaPlayerImplTest, ComputePlayState_FrameHiddenSuspendWithResume) {
528 SetUpMediaSuspend(true); 546 SetUpMediaSuspend(true);
529 base::test::ScopedFeatureList scoped_feature_list; 547 base::test::ScopedFeatureList scoped_feature_list;
530 scoped_feature_list.InitAndEnableFeature(kResumeBackgroundVideo); 548 scoped_feature_list.InitAndEnableFeature(kResumeBackgroundVideo);
531 549
532 InitializeWebMediaPlayerImpl(true); 550 InitializeWebMediaPlayerImpl(true);
533 SetMetadata(true, true); 551 SetMetadata(true, true);
534 SetReadyState(blink::WebMediaPlayer::ReadyStateHaveFutureData); 552 SetReadyState(blink::WebMediaPlayer::ReadyStateHaveFutureData);
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
919 937
920 INSTANTIATE_TEST_CASE_P(BackgroundBehaviorTestInstances, 938 INSTANTIATE_TEST_CASE_P(BackgroundBehaviorTestInstances,
921 WebMediaPlayerImplBackgroundBehaviorTest, 939 WebMediaPlayerImplBackgroundBehaviorTest,
922 ::testing::Combine(::testing::Bool(), 940 ::testing::Combine(::testing::Bool(),
923 ::testing::Bool(), 941 ::testing::Bool(),
924 ::testing::Values(5, 300), 942 ::testing::Values(5, 300),
925 ::testing::Values(5, 100), 943 ::testing::Values(5, 100),
926 ::testing::Bool())); 944 ::testing::Bool()));
927 945
928 } // namespace media 946 } // 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