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

Unified Diff: media/mojo/clients/mojo_renderer_unittest.cc

Issue 2281843003: Move ownership of audio/video sinks to MojoRendererService. (Closed)
Patch Set: rebase Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromecast/browser/media/cast_mojo_media_client.cc ('k') | media/mojo/services/mojo_media_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/clients/mojo_renderer_unittest.cc
diff --git a/media/mojo/clients/mojo_renderer_unittest.cc b/media/mojo/clients/mojo_renderer_unittest.cc
index 00d61f056486c6926b1cbf8538c1f79baca71f30..173db36668bc42e97bf16aec155e55443926e31b 100644
--- a/media/mojo/clients/mojo_renderer_unittest.cc
+++ b/media/mojo/clients/mojo_renderer_unittest.cc
@@ -9,11 +9,13 @@
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/threading/platform_thread.h"
+#include "media/base/audio_renderer_sink.h"
#include "media/base/cdm_config.h"
#include "media/base/cdm_context.h"
#include "media/base/gmock_callback_support.h"
#include "media/base/mock_filters.h"
#include "media/base/test_helpers.h"
+#include "media/base/video_renderer_sink.h"
#include "media/cdm/default_cdm_factory.h"
#include "media/mojo/clients/mojo_renderer.h"
#include "media/mojo/common/media_type_converters.h"
@@ -51,8 +53,8 @@ class MojoRendererTest : public ::testing::Test {
mojom::RendererPtr remote_renderer;
mojo_renderer_service_ = new MojoRendererService(
- mojo_cdm_service_context_.GetWeakPtr(), std::move(mock_renderer),
- mojo::GetProxy(&remote_renderer));
+ mojo_cdm_service_context_.GetWeakPtr(), nullptr, nullptr,
+ std::move(mock_renderer), mojo::GetProxy(&remote_renderer));
mojo_renderer_.reset(
new MojoRenderer(message_loop_.task_runner(),
« no previous file with comments | « chromecast/browser/media/cast_mojo_media_client.cc ('k') | media/mojo/services/mojo_media_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698