| OLD | NEW |
| 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 "base/tuple.h" | 5 #include "base/tuple.h" |
| 6 #include "content/browser/media/android/media_session.h" | 6 #include "content/browser/media/android/media_session.h" |
| 7 #include "content/browser/media/android/media_session_controller.h" | 7 #include "content/browser/media/android/media_session_controller.h" |
| 8 #include "content/browser/media/android/media_web_contents_observer_android.h" | 8 #include "content/browser/media/android/media_web_contents_observer_android.h" |
| 9 #include "content/common/media/media_player_delegate_messages.h" | 9 #include "content/common/media/media_player_delegate_messages.h" |
| 10 #include "content/test/test_render_view_host.h" | 10 #include "content/test/test_render_view_host.h" |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 EXPECT_TRUE(media_session()->IsSuspended()); | 139 EXPECT_TRUE(media_session()->IsSuspended()); |
| 140 EXPECT_FALSE(media_session()->IsControllable()); | 140 EXPECT_FALSE(media_session()->IsControllable()); |
| 141 } | 141 } |
| 142 | 142 |
| 143 TEST_F(MediaSessionControllerTest, VolumeMultiplier) { | 143 TEST_F(MediaSessionControllerTest, VolumeMultiplier) { |
| 144 ASSERT_TRUE(controller_->Initialize(true, false, DurationJustRight())); | 144 ASSERT_TRUE(controller_->Initialize(true, false, DurationJustRight())); |
| 145 EXPECT_FALSE(media_session()->IsSuspended()); | 145 EXPECT_FALSE(media_session()->IsSuspended()); |
| 146 EXPECT_TRUE(media_session()->IsControllable()); | 146 EXPECT_TRUE(media_session()->IsControllable()); |
| 147 | 147 |
| 148 // Upon creation of the MediaSession the default multiplier will be sent. | 148 // Upon creation of the MediaSession the default multiplier will be sent. |
| 149 // It's important to verify this since the renderer will mute the stream until |
| 150 // playback focus has been approved. |
| 149 EXPECT_TRUE(ReceivedMessageVolumeMultiplierUpdate< | 151 EXPECT_TRUE(ReceivedMessageVolumeMultiplierUpdate< |
| 150 MediaPlayerDelegateMsg_UpdateVolumeMultiplier>(1.0)); | 152 MediaPlayerDelegateMsg_UpdateVolumeMultiplier>(1.0)); |
| 151 | 153 |
| 152 // Verify a different volume multiplier is sent. | 154 // Verify a different volume multiplier is sent. |
| 153 const double kTestMultiplier = 0.5; | 155 const double kTestMultiplier = 0.5; |
| 154 SetVolumeMultiplier(kTestMultiplier); | 156 SetVolumeMultiplier(kTestMultiplier); |
| 155 EXPECT_TRUE(ReceivedMessageVolumeMultiplierUpdate< | 157 EXPECT_TRUE(ReceivedMessageVolumeMultiplierUpdate< |
| 156 MediaPlayerDelegateMsg_UpdateVolumeMultiplier>(kTestMultiplier)); | 158 MediaPlayerDelegateMsg_UpdateVolumeMultiplier>(kTestMultiplier)); |
| 157 } | 159 } |
| 158 | 160 |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 EXPECT_EQ(current_player_id, controller_->get_player_id_for_testing()); | 209 EXPECT_EQ(current_player_id, controller_->get_player_id_for_testing()); |
| 208 | 210 |
| 209 // Switch to a remote player, which should release the session. | 211 // Switch to a remote player, which should release the session. |
| 210 ASSERT_TRUE(controller_->Initialize(true, true, DurationJustRight())); | 212 ASSERT_TRUE(controller_->Initialize(true, true, DurationJustRight())); |
| 211 EXPECT_TRUE(media_session()->IsSuspended()); | 213 EXPECT_TRUE(media_session()->IsSuspended()); |
| 212 EXPECT_FALSE(media_session()->IsControllable()); | 214 EXPECT_FALSE(media_session()->IsControllable()); |
| 213 EXPECT_EQ(current_player_id, controller_->get_player_id_for_testing()); | 215 EXPECT_EQ(current_player_id, controller_->get_player_id_for_testing()); |
| 214 } | 216 } |
| 215 | 217 |
| 216 } // namespace content | 218 } // namespace content |
| OLD | NEW |