OLD | NEW |
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 "chromeos/dbus/dbus_clients_common.h" | 5 #include "chromeos/dbus/dbus_clients_common.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "chromeos/chromeos_switches.h" | 8 #include "chromeos/chromeos_switches.h" |
| 9 #include "chromeos/dbus/biod/biod_client.h" |
9 #include "chromeos/dbus/cras_audio_client.h" | 10 #include "chromeos/dbus/cras_audio_client.h" |
10 #include "chromeos/dbus/cryptohome_client.h" | 11 #include "chromeos/dbus/cryptohome_client.h" |
11 #include "chromeos/dbus/dbus_client_implementation_type.h" | 12 #include "chromeos/dbus/dbus_client_implementation_type.h" |
12 #include "chromeos/dbus/dbus_thread_manager.h" | 13 #include "chromeos/dbus/dbus_thread_manager.h" |
13 #include "chromeos/dbus/fake_cras_audio_client.h" | 14 #include "chromeos/dbus/fake_cras_audio_client.h" |
14 #include "chromeos/dbus/fake_cryptohome_client.h" | 15 #include "chromeos/dbus/fake_cryptohome_client.h" |
15 #include "chromeos/dbus/fake_gsm_sms_client.h" | 16 #include "chromeos/dbus/fake_gsm_sms_client.h" |
16 #include "chromeos/dbus/fake_modem_messaging_client.h" | 17 #include "chromeos/dbus/fake_modem_messaging_client.h" |
17 #include "chromeos/dbus/fake_permission_broker_client.h" | 18 #include "chromeos/dbus/fake_permission_broker_client.h" |
18 #include "chromeos/dbus/fake_shill_device_client.h" | 19 #include "chromeos/dbus/fake_shill_device_client.h" |
(...skipping 16 matching lines...) Expand all Loading... |
35 #include "chromeos/dbus/shill_profile_client.h" | 36 #include "chromeos/dbus/shill_profile_client.h" |
36 #include "chromeos/dbus/shill_service_client.h" | 37 #include "chromeos/dbus/shill_service_client.h" |
37 #include "chromeos/dbus/shill_third_party_vpn_driver_client.h" | 38 #include "chromeos/dbus/shill_third_party_vpn_driver_client.h" |
38 #include "chromeos/dbus/sms_client.h" | 39 #include "chromeos/dbus/sms_client.h" |
39 #include "chromeos/dbus/system_clock_client.h" | 40 #include "chromeos/dbus/system_clock_client.h" |
40 #include "chromeos/dbus/update_engine_client.h" | 41 #include "chromeos/dbus/update_engine_client.h" |
41 | 42 |
42 namespace chromeos { | 43 namespace chromeos { |
43 | 44 |
44 DBusClientsCommon::DBusClientsCommon(bool use_real_clients) { | 45 DBusClientsCommon::DBusClientsCommon(bool use_real_clients) { |
| 46 const DBusClientImplementationType client_impl_type = |
| 47 use_real_clients ? REAL_DBUS_CLIENT_IMPLEMENTATION |
| 48 : FAKE_DBUS_CLIENT_IMPLEMENTATION; |
| 49 |
| 50 biod_client_.reset(BiodClient::Create(client_impl_type)); |
| 51 |
45 if (use_real_clients) | 52 if (use_real_clients) |
46 cras_audio_client_.reset(CrasAudioClient::Create()); | 53 cras_audio_client_.reset(CrasAudioClient::Create()); |
47 else | 54 else |
48 cras_audio_client_.reset(new FakeCrasAudioClient); | 55 cras_audio_client_.reset(new FakeCrasAudioClient); |
49 | 56 |
50 if (use_real_clients) | 57 if (use_real_clients) |
51 cryptohome_client_.reset(CryptohomeClient::Create()); | 58 cryptohome_client_.reset(CryptohomeClient::Create()); |
52 else | 59 else |
53 cryptohome_client_.reset(new FakeCryptohomeClient); | 60 cryptohome_client_.reset(new FakeCryptohomeClient); |
54 | 61 |
(...skipping 28 matching lines...) Expand all Loading... |
83 if (use_real_clients) | 90 if (use_real_clients) |
84 modem_messaging_client_.reset(ModemMessagingClient::Create()); | 91 modem_messaging_client_.reset(ModemMessagingClient::Create()); |
85 else | 92 else |
86 modem_messaging_client_.reset(new FakeModemMessagingClient); | 93 modem_messaging_client_.reset(new FakeModemMessagingClient); |
87 | 94 |
88 if (use_real_clients) | 95 if (use_real_clients) |
89 permission_broker_client_.reset(PermissionBrokerClient::Create()); | 96 permission_broker_client_.reset(PermissionBrokerClient::Create()); |
90 else | 97 else |
91 permission_broker_client_.reset(new FakePermissionBrokerClient); | 98 permission_broker_client_.reset(new FakePermissionBrokerClient); |
92 | 99 |
93 power_manager_client_.reset(PowerManagerClient::Create( | 100 power_manager_client_.reset(PowerManagerClient::Create(client_impl_type)); |
94 use_real_clients ? REAL_DBUS_CLIENT_IMPLEMENTATION | |
95 : FAKE_DBUS_CLIENT_IMPLEMENTATION)); | |
96 | 101 |
97 session_manager_client_.reset(SessionManagerClient::Create( | 102 session_manager_client_.reset(SessionManagerClient::Create(client_impl_type)); |
98 use_real_clients ? REAL_DBUS_CLIENT_IMPLEMENTATION | |
99 : FAKE_DBUS_CLIENT_IMPLEMENTATION)); | |
100 | 103 |
101 if (use_real_clients) | 104 if (use_real_clients) |
102 sms_client_.reset(SMSClient::Create()); | 105 sms_client_.reset(SMSClient::Create()); |
103 else | 106 else |
104 sms_client_.reset(new FakeSMSClient); | 107 sms_client_.reset(new FakeSMSClient); |
105 | 108 |
106 if (use_real_clients) | 109 if (use_real_clients) |
107 system_clock_client_.reset(SystemClockClient::Create()); | 110 system_clock_client_.reset(SystemClockClient::Create()); |
108 else | 111 else |
109 system_clock_client_.reset(new FakeSystemClockClient); | 112 system_clock_client_.reset(new FakeSystemClockClient); |
110 | 113 |
111 update_engine_client_.reset(UpdateEngineClient::Create( | 114 update_engine_client_.reset(UpdateEngineClient::Create(client_impl_type)); |
112 use_real_clients ? REAL_DBUS_CLIENT_IMPLEMENTATION | |
113 : FAKE_DBUS_CLIENT_IMPLEMENTATION)); | |
114 } | 115 } |
115 | 116 |
116 DBusClientsCommon::~DBusClientsCommon() {} | 117 DBusClientsCommon::~DBusClientsCommon() {} |
117 | 118 |
118 void DBusClientsCommon::Initialize(dbus::Bus* system_bus) { | 119 void DBusClientsCommon::Initialize(dbus::Bus* system_bus) { |
119 DCHECK(DBusThreadManager::IsInitialized()); | 120 DCHECK(DBusThreadManager::IsInitialized()); |
120 | 121 |
| 122 biod_client_->Init(system_bus); |
121 cras_audio_client_->Init(system_bus); | 123 cras_audio_client_->Init(system_bus); |
122 cryptohome_client_->Init(system_bus); | 124 cryptohome_client_->Init(system_bus); |
123 gsm_sms_client_->Init(system_bus); | 125 gsm_sms_client_->Init(system_bus); |
124 modem_messaging_client_->Init(system_bus); | 126 modem_messaging_client_->Init(system_bus); |
125 permission_broker_client_->Init(system_bus); | 127 permission_broker_client_->Init(system_bus); |
126 power_manager_client_->Init(system_bus); | 128 power_manager_client_->Init(system_bus); |
127 session_manager_client_->Init(system_bus); | 129 session_manager_client_->Init(system_bus); |
128 shill_device_client_->Init(system_bus); | 130 shill_device_client_->Init(system_bus); |
129 shill_ipconfig_client_->Init(system_bus); | 131 shill_ipconfig_client_->Init(system_bus); |
130 shill_manager_client_->Init(system_bus); | 132 shill_manager_client_->Init(system_bus); |
131 shill_service_client_->Init(system_bus); | 133 shill_service_client_->Init(system_bus); |
132 shill_profile_client_->Init(system_bus); | 134 shill_profile_client_->Init(system_bus); |
133 shill_third_party_vpn_driver_client_->Init(system_bus); | 135 shill_third_party_vpn_driver_client_->Init(system_bus); |
134 sms_client_->Init(system_bus); | 136 sms_client_->Init(system_bus); |
135 system_clock_client_->Init(system_bus); | 137 system_clock_client_->Init(system_bus); |
136 update_engine_client_->Init(system_bus); | 138 update_engine_client_->Init(system_bus); |
137 | 139 |
138 ShillManagerClient::TestInterface* manager = | 140 ShillManagerClient::TestInterface* manager = |
139 shill_manager_client_->GetTestInterface(); | 141 shill_manager_client_->GetTestInterface(); |
140 if (manager) | 142 if (manager) |
141 manager->SetupDefaultEnvironment(); | 143 manager->SetupDefaultEnvironment(); |
142 } | 144 } |
143 | 145 |
144 } // namespace chromeos | 146 } // namespace chromeos |
OLD | NEW |