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 <stdint.h> | 5 #include <stdint.h> |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
10 #include "base/test/test_message_loop.h" | 10 #include "base/test/test_message_loop.h" |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 MojoRendererTest() { | 59 MojoRendererTest() { |
60 std::unique_ptr<StrictMock<MockRenderer>> mock_renderer( | 60 std::unique_ptr<StrictMock<MockRenderer>> mock_renderer( |
61 new StrictMock<MockRenderer>()); | 61 new StrictMock<MockRenderer>()); |
62 mock_renderer_ = mock_renderer.get(); | 62 mock_renderer_ = mock_renderer.get(); |
63 | 63 |
64 mojom::RendererPtr remote_renderer; | 64 mojom::RendererPtr remote_renderer; |
65 renderer_binding_ = MojoRendererService::Create( | 65 renderer_binding_ = MojoRendererService::Create( |
66 mojo_cdm_service_context_.GetWeakPtr(), nullptr, nullptr, | 66 mojo_cdm_service_context_.GetWeakPtr(), nullptr, nullptr, |
67 std::move(mock_renderer), | 67 std::move(mock_renderer), |
68 MojoRendererService::InitiateSurfaceRequestCB(), | 68 MojoRendererService::InitiateSurfaceRequestCB(), |
69 mojo::GetProxy(&remote_renderer)); | 69 mojo::MakeRequest(&remote_renderer)); |
70 | 70 |
71 mojo_renderer_.reset( | 71 mojo_renderer_.reset( |
72 new MojoRenderer(message_loop_.task_runner(), | 72 new MojoRenderer(message_loop_.task_runner(), |
73 std::unique_ptr<VideoOverlayFactory>(nullptr), nullptr, | 73 std::unique_ptr<VideoOverlayFactory>(nullptr), nullptr, |
74 std::move(remote_renderer))); | 74 std::move(remote_renderer))); |
75 | 75 |
76 // CreateAudioStream() and CreateVideoStream() overrides expectations for | 76 // CreateAudioStream() and CreateVideoStream() overrides expectations for |
77 // expected non-NULL streams. | 77 // expected non-NULL streams. |
78 EXPECT_CALL(demuxer_, GetStream(_)).WillRepeatedly(Return(nullptr)); | 78 EXPECT_CALL(demuxer_, GetStream(_)).WillRepeatedly(Return(nullptr)); |
79 | 79 |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
167 mojom::DecryptorPtr decryptor) { | 167 mojom::DecryptorPtr decryptor) { |
168 EXPECT_TRUE(result->success); | 168 EXPECT_TRUE(result->success); |
169 EXPECT_NE(CdmContext::kInvalidCdmId, cdm_id); | 169 EXPECT_NE(CdmContext::kInvalidCdmId, cdm_id); |
170 cdm_context_.set_cdm_id(cdm_id); | 170 cdm_context_.set_cdm_id(cdm_id); |
171 } | 171 } |
172 | 172 |
173 void CreateCdm() { | 173 void CreateCdm() { |
174 mojo::MakeStrongBinding( | 174 mojo::MakeStrongBinding( |
175 base::MakeUnique<MojoCdmService>(mojo_cdm_service_context_.GetWeakPtr(), | 175 base::MakeUnique<MojoCdmService>(mojo_cdm_service_context_.GetWeakPtr(), |
176 &cdm_factory_), | 176 &cdm_factory_), |
177 mojo::GetProxy(&remote_cdm_)); | 177 mojo::MakeRequest(&remote_cdm_)); |
178 remote_cdm_->Initialize( | 178 remote_cdm_->Initialize( |
179 kClearKeyKeySystem, "https://www.test.com", | 179 kClearKeyKeySystem, "https://www.test.com", |
180 mojom::CdmConfig::From(CdmConfig()), | 180 mojom::CdmConfig::From(CdmConfig()), |
181 base::Bind(&MojoRendererTest::OnCdmCreated, base::Unretained(this))); | 181 base::Bind(&MojoRendererTest::OnCdmCreated, base::Unretained(this))); |
182 base::RunLoop().RunUntilIdle(); | 182 base::RunLoop().RunUntilIdle(); |
183 } | 183 } |
184 | 184 |
185 void StartPlayingFrom(base::TimeDelta start_time) { | 185 void StartPlayingFrom(base::TimeDelta start_time) { |
186 EXPECT_CALL(*mock_renderer_, StartPlayingFrom(start_time)); | 186 EXPECT_CALL(*mock_renderer_, StartPlayingFrom(start_time)); |
187 mojo_renderer_->StartPlayingFrom(start_time); | 187 mojo_renderer_->StartPlayingFrom(start_time); |
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
457 Play(); | 457 Play(); |
458 remote_renderer_client_->OnError(PIPELINE_ERROR_DECODE); | 458 remote_renderer_client_->OnError(PIPELINE_ERROR_DECODE); |
459 base::RunLoop().RunUntilIdle(); | 459 base::RunLoop().RunUntilIdle(); |
460 | 460 |
461 EXPECT_CALL(*mock_renderer_, SetPlaybackRate(0.0)).Times(1); | 461 EXPECT_CALL(*mock_renderer_, SetPlaybackRate(0.0)).Times(1); |
462 mojo_renderer_->SetPlaybackRate(0.0); | 462 mojo_renderer_->SetPlaybackRate(0.0); |
463 Flush(); | 463 Flush(); |
464 } | 464 } |
465 | 465 |
466 } // namespace media | 466 } // namespace media |
OLD | NEW |