Chromium Code Reviews| 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/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 47 public: | 47 public: |
| 48 MojoRendererTest() { | 48 MojoRendererTest() { |
| 49 std::unique_ptr<StrictMock<MockRenderer>> mock_renderer( | 49 std::unique_ptr<StrictMock<MockRenderer>> mock_renderer( |
| 50 new StrictMock<MockRenderer>()); | 50 new StrictMock<MockRenderer>()); |
| 51 mock_renderer_ = mock_renderer.get(); | 51 mock_renderer_ = mock_renderer.get(); |
| 52 | 52 |
| 53 mojom::RendererPtr remote_renderer; | 53 mojom::RendererPtr remote_renderer; |
| 54 | 54 |
| 55 mojo_renderer_service_ = new MojoRendererService( | 55 mojo_renderer_service_ = new MojoRendererService( |
| 56 mojo_cdm_service_context_.GetWeakPtr(), nullptr, nullptr, | 56 mojo_cdm_service_context_.GetWeakPtr(), nullptr, nullptr, |
| 57 std::move(mock_renderer), mojo::GetProxy(&remote_renderer)); | 57 std::move(mock_renderer), mojo::GetProxy(&remote_renderer), |
| 58 base::Callback<uint64_t()>()); | |
|
watk
2016/09/01 21:58:58
InitiateSurfaceRequestCB() for readability?
tguilbert
2016/09/21 02:02:30
Done.
| |
| 58 | 59 |
| 59 mojo_renderer_.reset( | 60 mojo_renderer_.reset( |
| 60 new MojoRenderer(message_loop_.task_runner(), | 61 new MojoRenderer(message_loop_.task_runner(), |
| 61 std::unique_ptr<VideoOverlayFactory>(nullptr), nullptr, | 62 std::unique_ptr<VideoOverlayFactory>(nullptr), nullptr, |
| 62 std::move(remote_renderer))); | 63 std::move(remote_renderer))); |
| 63 | 64 |
| 64 // CreateAudioStream() and CreateVideoStream() overrides expectations for | 65 // CreateAudioStream() and CreateVideoStream() overrides expectations for |
| 65 // expected non-NULL streams. | 66 // expected non-NULL streams. |
| 66 EXPECT_CALL(demuxer_, GetStream(_)).WillRepeatedly(Return(nullptr)); | 67 EXPECT_CALL(demuxer_, GetStream(_)).WillRepeatedly(Return(nullptr)); |
| 67 | 68 |
| (...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 389 Play(); | 390 Play(); |
| 390 remote_renderer_client_->OnError(PIPELINE_ERROR_DECODE); | 391 remote_renderer_client_->OnError(PIPELINE_ERROR_DECODE); |
| 391 base::RunLoop().RunUntilIdle(); | 392 base::RunLoop().RunUntilIdle(); |
| 392 | 393 |
| 393 EXPECT_CALL(*mock_renderer_, SetPlaybackRate(0.0)).Times(1); | 394 EXPECT_CALL(*mock_renderer_, SetPlaybackRate(0.0)).Times(1); |
| 394 mojo_renderer_->SetPlaybackRate(0.0); | 395 mojo_renderer_->SetPlaybackRate(0.0); |
| 395 Flush(); | 396 Flush(); |
| 396 } | 397 } |
| 397 | 398 |
| 398 } // namespace media | 399 } // namespace media |
| OLD | NEW |