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 "components/arc/arc_service_manager.h" | 5 #include "components/arc/arc_service_manager.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
10 #include "base/sequenced_task_runner.h" | 10 #include "base/sequenced_task_runner.h" |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 g_arc_bridge_service_for_testing = nullptr; | 53 g_arc_bridge_service_for_testing = nullptr; |
54 } else { | 54 } else { |
55 arc_bridge_service_.reset(new ArcBridgeServiceImpl( | 55 arc_bridge_service_.reset(new ArcBridgeServiceImpl( |
56 ArcBridgeBootstrap::Create())); | 56 ArcBridgeBootstrap::Create())); |
57 } | 57 } |
58 | 58 |
59 AddService(base::MakeUnique<ArcAudioBridge>(arc_bridge_service())); | 59 AddService(base::MakeUnique<ArcAudioBridge>(arc_bridge_service())); |
60 AddService(base::MakeUnique<ArcBluetoothBridge>(arc_bridge_service())); | 60 AddService(base::MakeUnique<ArcBluetoothBridge>(arc_bridge_service())); |
61 AddService(base::MakeUnique<ArcBootPhaseMonitorBridge>(arc_bridge_service())); | 61 AddService(base::MakeUnique<ArcBootPhaseMonitorBridge>(arc_bridge_service())); |
62 AddService(base::MakeUnique<ArcClipboardBridge>(arc_bridge_service())); | 62 AddService(base::MakeUnique<ArcClipboardBridge>(arc_bridge_service())); |
63 AddService(base::MakeUnique<ArcCrashCollectorBridge>(arc_bridge_service())); | 63 AddService(base::MakeUnique<ArcCrashCollectorBridge>(arc_bridge_service(), |
| 64 blocking_task_runner_)); |
64 AddService(base::MakeUnique<ArcImeService>(arc_bridge_service())); | 65 AddService(base::MakeUnique<ArcImeService>(arc_bridge_service())); |
65 AddService(base::MakeUnique<ArcMetricsService>(arc_bridge_service())); | 66 AddService(base::MakeUnique<ArcMetricsService>(arc_bridge_service())); |
66 AddService(base::MakeUnique<ArcNetHostImpl>(arc_bridge_service())); | 67 AddService(base::MakeUnique<ArcNetHostImpl>(arc_bridge_service())); |
67 AddService(base::MakeUnique<ArcObbMounterBridge>(arc_bridge_service())); | 68 AddService(base::MakeUnique<ArcObbMounterBridge>(arc_bridge_service())); |
68 AddService(base::MakeUnique<ArcPowerBridge>(arc_bridge_service())); | 69 AddService(base::MakeUnique<ArcPowerBridge>(arc_bridge_service())); |
69 AddService(base::MakeUnique<ArcStorageManager>(arc_bridge_service())); | 70 AddService(base::MakeUnique<ArcStorageManager>(arc_bridge_service())); |
70 } | 71 } |
71 | 72 |
72 ArcServiceManager::~ArcServiceManager() { | 73 ArcServiceManager::~ArcServiceManager() { |
73 DCHECK(thread_checker_.CalledOnValidThread()); | 74 DCHECK(thread_checker_.CalledOnValidThread()); |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
113 // static | 114 // static |
114 void ArcServiceManager::SetArcBridgeServiceForTesting( | 115 void ArcServiceManager::SetArcBridgeServiceForTesting( |
115 std::unique_ptr<ArcBridgeService> arc_bridge_service) { | 116 std::unique_ptr<ArcBridgeService> arc_bridge_service) { |
116 if (g_arc_bridge_service_for_testing) { | 117 if (g_arc_bridge_service_for_testing) { |
117 delete g_arc_bridge_service_for_testing; | 118 delete g_arc_bridge_service_for_testing; |
118 } | 119 } |
119 g_arc_bridge_service_for_testing = arc_bridge_service.release(); | 120 g_arc_bridge_service_for_testing = arc_bridge_service.release(); |
120 } | 121 } |
121 | 122 |
122 } // namespace arc | 123 } // namespace arc |
OLD | NEW |