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

Side by Side Diff: media/mojo/services/test_mojo_media_client.cc

Issue 1882423004: Move shell service to toplevel shell namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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
« no previous file with comments | « media/mojo/services/test_mojo_media_client.h ('k') | media/test/pipeline_integration_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "media/mojo/services/test_mojo_media_client.h" 5 #include "media/mojo/services/test_mojo_media_client.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "media/audio/audio_manager_base.h" 8 #include "media/audio/audio_manager_base.h"
9 #include "media/audio/audio_output_stream_sink.h" 9 #include "media/audio/audio_output_stream_sink.h"
10 #include "media/base/audio_hardware_config.h" 10 #include "media/base/audio_hardware_config.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 if (!video_renderer_sink_) { 58 if (!video_renderer_sink_) {
59 video_renderer_sink_ = base::WrapUnique( 59 video_renderer_sink_ = base::WrapUnique(
60 new NullVideoSink(false, base::TimeDelta::FromSecondsD(1.0 / 60), 60 new NullVideoSink(false, base::TimeDelta::FromSecondsD(1.0 / 60),
61 NullVideoSink::NewFrameCB(), task_runner)); 61 NullVideoSink::NewFrameCB(), task_runner));
62 } 62 }
63 63
64 return video_renderer_sink_.get(); 64 return video_renderer_sink_.get();
65 } 65 }
66 66
67 std::unique_ptr<CdmFactory> TestMojoMediaClient::CreateCdmFactory( 67 std::unique_ptr<CdmFactory> TestMojoMediaClient::CreateCdmFactory(
68 mojo::shell::mojom::InterfaceProvider* /* interface_provider */) { 68 shell::mojom::InterfaceProvider* /* interface_provider */) {
69 DVLOG(1) << __FUNCTION__; 69 DVLOG(1) << __FUNCTION__;
70 return base::WrapUnique(new DefaultCdmFactory()); 70 return base::WrapUnique(new DefaultCdmFactory());
71 } 71 }
72 72
73 } // namespace media 73 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/test_mojo_media_client.h ('k') | media/test/pipeline_integration_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698