OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 <stddef.h> | 5 #include <stddef.h> |
6 | 6 |
7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
8 #include "base/single_thread_task_runner.h" | 8 #include "base/single_thread_task_runner.h" |
9 #include "content/public/renderer/media_stream_renderer_factory.h" | 9 #include "content/public/renderer/media_stream_renderer_factory.h" |
10 #include "content/renderer/media/webmediaplayer_ms.h" | 10 #include "content/renderer/media/webmediaplayer_ms.h" |
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
396 public blink::WebMediaPlayerClient, | 396 public blink::WebMediaPlayerClient, |
397 public cc::VideoFrameProvider::Client { | 397 public cc::VideoFrameProvider::Client { |
398 public: | 398 public: |
399 WebMediaPlayerMSTest() | 399 WebMediaPlayerMSTest() |
400 : render_factory_(new MockRenderFactory(message_loop_.task_runner(), | 400 : render_factory_(new MockRenderFactory(message_loop_.task_runner(), |
401 &message_loop_controller_)), | 401 &message_loop_controller_)), |
402 player_(new WebMediaPlayerMS( | 402 player_(new WebMediaPlayerMS( |
403 nullptr, | 403 nullptr, |
404 this, | 404 this, |
405 &delegate_, | 405 &delegate_, |
406 new media::MediaLog(), | 406 base::MakeUnique<media::MediaLog>(), |
407 std::unique_ptr<MediaStreamRendererFactory>(render_factory_), | 407 std::unique_ptr<MediaStreamRendererFactory>(render_factory_), |
408 message_loop_.task_runner(), | 408 message_loop_.task_runner(), |
409 message_loop_.task_runner(), | 409 message_loop_.task_runner(), |
410 message_loop_.task_runner(), | 410 message_loop_.task_runner(), |
411 message_loop_.task_runner(), | 411 message_loop_.task_runner(), |
412 nullptr, | 412 nullptr, |
413 blink::WebString(), | 413 blink::WebString(), |
414 blink::WebSecurityOrigin())), | 414 blink::WebSecurityOrigin())), |
415 web_layer_set_(false), | 415 web_layer_set_(false), |
416 rendering_(false), | 416 rendering_(false), |
(...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
969 // OnShown() should restart after a forced suspension. | 969 // OnShown() should restart after a forced suspension. |
970 player_->OnFrameShown(); | 970 player_->OnFrameShown(); |
971 EXPECT_FALSE(player_->Paused()); | 971 EXPECT_FALSE(player_->Paused()); |
972 EXPECT_CALL(*this, DoSetWebLayer(false)); | 972 EXPECT_CALL(*this, DoSetWebLayer(false)); |
973 | 973 |
974 base::RunLoop().RunUntilIdle(); | 974 base::RunLoop().RunUntilIdle(); |
975 } | 975 } |
976 #endif | 976 #endif |
977 | 977 |
978 } // namespace content | 978 } // namespace content |
OLD | NEW |