| 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 "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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 base::WeakPtr<WebMediaPlayerDelegate>(), | 101 base::WeakPtr<WebMediaPlayerDelegate>(), |
| 102 base::WrapUnique(new DefaultRendererFactory( | 102 base::WrapUnique(new DefaultRendererFactory( |
| 103 media_log_, nullptr, DefaultRendererFactory::GetGpuFactoriesCB(), | 103 media_log_, nullptr, DefaultRendererFactory::GetGpuFactoriesCB(), |
| 104 audio_hardware_config_)), | 104 audio_hardware_config_)), |
| 105 url_index_, | 105 url_index_, |
| 106 WebMediaPlayerParams( | 106 WebMediaPlayerParams( |
| 107 WebMediaPlayerParams::DeferLoadCB(), | 107 WebMediaPlayerParams::DeferLoadCB(), |
| 108 scoped_refptr<SwitchableAudioRendererSink>(), media_log_, | 108 scoped_refptr<SwitchableAudioRendererSink>(), media_log_, |
| 109 media_thread_.task_runner(), message_loop_.task_runner(), | 109 media_thread_.task_runner(), message_loop_.task_runner(), |
| 110 message_loop_.task_runner(), WebMediaPlayerParams::Context3DCB(), | 110 message_loop_.task_runner(), WebMediaPlayerParams::Context3DCB(), |
| 111 base::Bind(&OnAdjustAllocatedMemory), nullptr, nullptr, nullptr))); | 111 base::Bind(&OnAdjustAllocatedMemory), nullptr, nullptr, nullptr, |
| 112 true))); |
| 112 } | 113 } |
| 113 | 114 |
| 114 ~WebMediaPlayerImplTest() override { | 115 ~WebMediaPlayerImplTest() override { |
| 115 // Destruct WebMediaPlayerImpl and pump the message loop to ensure that | 116 // Destruct WebMediaPlayerImpl and pump the message loop to ensure that |
| 116 // objects passed to the message loop for destruction are released. | 117 // objects passed to the message loop for destruction are released. |
| 117 // | 118 // |
| 118 // NOTE: This should be done before any other member variables are | 119 // NOTE: This should be done before any other member variables are |
| 119 // destructed since WMPI may reference them during destruction. | 120 // destructed since WMPI may reference them during destruction. |
| 120 wmpi_.reset(); | 121 wmpi_.reset(); |
| 121 message_loop_.RunUntilIdle(); | 122 message_loop_.RunUntilIdle(); |
| (...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 367 EXPECT_FALSE(state.is_memory_reporting_enabled); | 368 EXPECT_FALSE(state.is_memory_reporting_enabled); |
| 368 EXPECT_FALSE(state.is_suspended); | 369 EXPECT_FALSE(state.is_suspended); |
| 369 | 370 |
| 370 state = ComputeIdlePlayState(); | 371 state = ComputeIdlePlayState(); |
| 371 EXPECT_EQ(WebMediaPlayerImpl::DelegateState::ENDED, state.delegate_state); | 372 EXPECT_EQ(WebMediaPlayerImpl::DelegateState::ENDED, state.delegate_state); |
| 372 EXPECT_FALSE(state.is_memory_reporting_enabled); | 373 EXPECT_FALSE(state.is_memory_reporting_enabled); |
| 373 EXPECT_TRUE(state.is_suspended); | 374 EXPECT_TRUE(state.is_suspended); |
| 374 } | 375 } |
| 375 | 376 |
| 376 } // namespace media | 377 } // namespace media |
| OLD | NEW |