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 |
11 #include "base/bind.h" | 11 #include "base/bind.h" |
12 #include "base/callback_helpers.h" | 12 #include "base/callback_helpers.h" |
13 #include "base/memory/ptr_util.h" | 13 #include "base/memory/ptr_util.h" |
14 #include "base/memory/ref_counted.h" | 14 #include "base/memory/ref_counted.h" |
15 #include "base/memory/weak_ptr.h" | 15 #include "base/memory/weak_ptr.h" |
16 #include "base/message_loop/message_loop.h" | 16 #include "base/message_loop/message_loop.h" |
| 17 #include "base/run_loop.h" |
17 #include "base/threading/thread.h" | 18 #include "base/threading/thread.h" |
18 #include "base/threading/thread_task_runner_handle.h" | 19 #include "base/threading/thread_task_runner_handle.h" |
19 #include "media/base/media_log.h" | 20 #include "media/base/media_log.h" |
20 #include "media/base/test_helpers.h" | 21 #include "media/base/test_helpers.h" |
21 #include "media/blink/mock_webframeclient.h" | 22 #include "media/blink/mock_webframeclient.h" |
22 #include "media/blink/webmediaplayer_delegate.h" | 23 #include "media/blink/webmediaplayer_delegate.h" |
23 #include "media/blink/webmediaplayer_params.h" | 24 #include "media/blink/webmediaplayer_params.h" |
24 #include "media/renderers/default_renderer_factory.h" | 25 #include "media/renderers/default_renderer_factory.h" |
25 #include "testing/gmock/include/gmock/gmock.h" | 26 #include "testing/gmock/include/gmock/gmock.h" |
26 #include "testing/gtest/include/gtest/gtest.h" | 27 #include "testing/gtest/include/gtest/gtest.h" |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 base::Bind(&OnAdjustAllocatedMemory), nullptr, nullptr, nullptr))); | 109 base::Bind(&OnAdjustAllocatedMemory), nullptr, nullptr, nullptr))); |
109 } | 110 } |
110 | 111 |
111 ~WebMediaPlayerImplTest() override { | 112 ~WebMediaPlayerImplTest() override { |
112 // Destruct WebMediaPlayerImpl and pump the message loop to ensure that | 113 // Destruct WebMediaPlayerImpl and pump the message loop to ensure that |
113 // objects passed to the message loop for destruction are released. | 114 // objects passed to the message loop for destruction are released. |
114 // | 115 // |
115 // NOTE: This should be done before any other member variables are | 116 // NOTE: This should be done before any other member variables are |
116 // destructed since WMPI may reference them during destruction. | 117 // destructed since WMPI may reference them during destruction. |
117 wmpi_.reset(); | 118 wmpi_.reset(); |
118 message_loop_.RunUntilIdle(); | 119 base::RunLoop().RunUntilIdle(); |
119 | 120 |
120 web_view_->close(); | 121 web_view_->close(); |
121 web_local_frame_->close(); | 122 web_local_frame_->close(); |
122 } | 123 } |
123 | 124 |
124 protected: | 125 protected: |
125 void SetReadyState(blink::WebMediaPlayer::ReadyState state) { | 126 void SetReadyState(blink::WebMediaPlayer::ReadyState state) { |
126 wmpi_->SetReadyState(state); | 127 wmpi_->SetReadyState(state); |
127 } | 128 } |
128 | 129 |
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
429 EXPECT_FALSE(state.is_suspended); | 430 EXPECT_FALSE(state.is_suspended); |
430 | 431 |
431 SetPaused(false); | 432 SetPaused(false); |
432 state = ComputePlayStateSuspended(); | 433 state = ComputePlayStateSuspended(); |
433 EXPECT_EQ(WebMediaPlayerImpl::DelegateState::PLAYING, state.delegate_state); | 434 EXPECT_EQ(WebMediaPlayerImpl::DelegateState::PLAYING, state.delegate_state); |
434 EXPECT_TRUE(state.is_memory_reporting_enabled); | 435 EXPECT_TRUE(state.is_memory_reporting_enabled); |
435 EXPECT_FALSE(state.is_suspended); | 436 EXPECT_FALSE(state.is_suspended); |
436 } | 437 } |
437 | 438 |
438 } // namespace media | 439 } // namespace media |
OLD | NEW |