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/media_service_factory.h" | 9 #include "media/mojo/services/media_service_factory.h" |
10 #include "services/service_manager/public/c/main.h" | 10 #include "services/service_manager/public/c/main.h" |
11 #include "services/service_manager/public/cpp/service_runner.h" | 11 #include "services/service_manager/public/cpp/service_runner.h" |
12 | 12 |
13 MojoResult ServiceMain(MojoHandle mojo_handle) { | 13 MojoResult ServiceMain(MojoHandle mojo_handle) { |
14 // Enable logging. | 14 // Enable logging. |
| 15 base::AtExitManager at_exit; |
15 service_manager::ServiceRunner::InitBaseCommandLine(); | 16 service_manager::ServiceRunner::InitBaseCommandLine(); |
16 | 17 |
17 logging::LoggingSettings settings; | 18 logging::LoggingSettings settings; |
18 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; | 19 settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; |
19 logging::InitLogging(settings); | 20 logging::InitLogging(settings); |
20 | 21 |
21 std::unique_ptr<service_manager::Service> service = | 22 std::unique_ptr<service_manager::Service> service = |
22 media::CreateMediaServiceForTesting(); | 23 media::CreateMediaServiceForTesting(); |
23 service_manager::ServiceRunner runner(service.release()); | 24 service_manager::ServiceRunner runner(service.release()); |
24 return runner.Run(mojo_handle, false /* init_base */); | 25 return runner.Run(mojo_handle, false /* init_base */); |
25 } | 26 } |
OLD | NEW |