Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(151)

Side by Side Diff: media/mojo/clients/mojo_renderer_unittest.cc

Issue 2282633002: Integrate Surface requests with MediaPlayerRenderer (Closed)
Patch Set: Fixed merge error Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 } // namespace 55 } // namespace
56 56
57 class MojoRendererTest : public ::testing::Test { 57 class MojoRendererTest : public ::testing::Test {
58 public: 58 public:
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_ = 65 renderer_binding_ = mojo::MakeStrongBinding(
66 mojo::MakeStrongBinding(base::MakeUnique<MojoRendererService>( 66 base::MakeUnique<MojoRendererService>(
67 mojo_cdm_service_context_.GetWeakPtr(), 67 mojo_cdm_service_context_.GetWeakPtr(), nullptr, nullptr,
68 nullptr, nullptr, std::move(mock_renderer)), 68 std::move(mock_renderer),
69 mojo::GetProxy(&remote_renderer)); 69 MojoRendererService::InitiateSurfaceRequestCB()),
70 mojo::GetProxy(&remote_renderer));
70 71
71 mojo_renderer_.reset( 72 mojo_renderer_.reset(
72 new MojoRenderer(message_loop_.task_runner(), 73 new MojoRenderer(message_loop_.task_runner(),
73 std::unique_ptr<VideoOverlayFactory>(nullptr), nullptr, 74 std::unique_ptr<VideoOverlayFactory>(nullptr), nullptr,
74 std::move(remote_renderer))); 75 std::move(remote_renderer)));
75 76
76 // CreateAudioStream() and CreateVideoStream() overrides expectations for 77 // CreateAudioStream() and CreateVideoStream() overrides expectations for
77 // expected non-NULL streams. 78 // expected non-NULL streams.
78 EXPECT_CALL(demuxer_, GetStream(_)).WillRepeatedly(Return(nullptr)); 79 EXPECT_CALL(demuxer_, GetStream(_)).WillRepeatedly(Return(nullptr));
79 80
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 Play(); 426 Play();
426 remote_renderer_client_->OnError(PIPELINE_ERROR_DECODE); 427 remote_renderer_client_->OnError(PIPELINE_ERROR_DECODE);
427 base::RunLoop().RunUntilIdle(); 428 base::RunLoop().RunUntilIdle();
428 429
429 EXPECT_CALL(*mock_renderer_, SetPlaybackRate(0.0)).Times(1); 430 EXPECT_CALL(*mock_renderer_, SetPlaybackRate(0.0)).Times(1);
430 mojo_renderer_->SetPlaybackRate(0.0); 431 mojo_renderer_->SetPlaybackRate(0.0);
431 Flush(); 432 Flush();
432 } 433 }
433 434
434 } // namespace media 435 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698