| OLD | NEW |
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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 "services/device/device_service_test_base.h" | 5 #include "services/device/device_service_test_base.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "base/threading/thread.h" | 10 #include "base/threading/thread.h" |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 | 44 |
| 45 void CreateService(service_manager::mojom::ServiceRequest request, | 45 void CreateService(service_manager::mojom::ServiceRequest request, |
| 46 const std::string& name) override { | 46 const std::string& name) override { |
| 47 if (name == device::mojom::kServiceName) { | 47 if (name == device::mojom::kServiceName) { |
| 48 io_thread_.Start(); | 48 io_thread_.Start(); |
| 49 file_thread_.Start(); | 49 file_thread_.Start(); |
| 50 #if defined(OS_ANDROID) | 50 #if defined(OS_ANDROID) |
| 51 device_service_context_.reset(new service_manager::ServiceContext( | 51 device_service_context_.reset(new service_manager::ServiceContext( |
| 52 CreateDeviceService(file_thread_.task_runner(), | 52 CreateDeviceService(file_thread_.task_runner(), |
| 53 io_thread_.task_runner(), | 53 io_thread_.task_runner(), |
| 54 wake_lock_context_callback_), | 54 wake_lock_context_callback_, nullptr), |
| 55 std::move(request))); | 55 std::move(request))); |
| 56 #else | 56 #else |
| 57 device_service_context_.reset(new service_manager::ServiceContext( | 57 device_service_context_.reset(new service_manager::ServiceContext( |
| 58 CreateDeviceService(file_thread_.task_runner(), | 58 CreateDeviceService(file_thread_.task_runner(), |
| 59 io_thread_.task_runner()), | 59 io_thread_.task_runner()), |
| 60 std::move(request))); | 60 std::move(request))); |
| 61 #endif | 61 #endif |
| 62 } | 62 } |
| 63 } | 63 } |
| 64 | 64 |
| (...skipping 19 matching lines...) Expand all Loading... |
| 84 : ServiceTest(kTestServiceName) {} | 84 : ServiceTest(kTestServiceName) {} |
| 85 | 85 |
| 86 DeviceServiceTestBase::~DeviceServiceTestBase() {} | 86 DeviceServiceTestBase::~DeviceServiceTestBase() {} |
| 87 | 87 |
| 88 std::unique_ptr<service_manager::Service> | 88 std::unique_ptr<service_manager::Service> |
| 89 DeviceServiceTestBase::CreateService() { | 89 DeviceServiceTestBase::CreateService() { |
| 90 return base::MakeUnique<ServiceTestClient>(this); | 90 return base::MakeUnique<ServiceTestClient>(this); |
| 91 } | 91 } |
| 92 | 92 |
| 93 } // namespace device | 93 } // namespace device |
| OLD | NEW |