OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "base/at_exit.h" | 5 #include "base/at_exit.h" |
6 #include "base/bind.h" | 6 #include "base/bind.h" |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
9 #include "media/mojo/services/mojo_media_application.h" | 9 #include "media/mojo/services/mojo_media_application.h" |
10 #include "media/mojo/services/test_mojo_media_client.h" | 10 #include "media/mojo/services/test_mojo_media_client.h" |
(...skipping 14 matching lines...) Expand all Loading... |
25 MojoResult ServiceMain(MojoHandle mojo_handle) { | 25 MojoResult ServiceMain(MojoHandle mojo_handle) { |
26 // Enable logging. | 26 // Enable logging. |
27 base::AtExitManager at_exit; | 27 base::AtExitManager at_exit; |
28 shell::ServiceRunner::InitBaseCommandLine(); | 28 shell::ServiceRunner::InitBaseCommandLine(); |
29 | 29 |
30 logging::LoggingSettings settings; | 30 logging::LoggingSettings settings; |
31 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; | 31 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; |
32 logging::InitLogging(settings); | 32 logging::InitLogging(settings); |
33 | 33 |
34 shell::ServiceRunner runner(new media::MojoMediaApplication( | 34 shell::ServiceRunner runner(new media::MojoMediaApplication( |
35 base::WrapUnique(new media::TestMojoMediaClient()), | 35 base::MakeUnique<media::TestMojoMediaClient>(), |
36 base::Bind(&QuitApplication))); | 36 base::Bind(&QuitApplication))); |
37 g_runner = &runner; | 37 g_runner = &runner; |
38 return runner.Run(mojo_handle, false /* init_base */); | 38 return runner.Run(mojo_handle, false /* init_base */); |
39 } | 39 } |
OLD | NEW |