Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(883)

Side by Side Diff: chromeos/dbus/dbus_client_bundle.cc

Issue 681723003: Add new shill client for VPN (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated the interface to better suit the upper layer Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_client_bundle.h" 5 #include "chromeos/dbus/dbus_client_bundle.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/string_split.h" 8 #include "base/strings/string_split.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "chromeos/chromeos_switches.h" 10 #include "chromeos/chromeos_switches.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 #include "chromeos/dbus/fake_nfc_device_client.h" 44 #include "chromeos/dbus/fake_nfc_device_client.h"
45 #include "chromeos/dbus/fake_nfc_manager_client.h" 45 #include "chromeos/dbus/fake_nfc_manager_client.h"
46 #include "chromeos/dbus/fake_nfc_record_client.h" 46 #include "chromeos/dbus/fake_nfc_record_client.h"
47 #include "chromeos/dbus/fake_nfc_tag_client.h" 47 #include "chromeos/dbus/fake_nfc_tag_client.h"
48 #include "chromeos/dbus/fake_permission_broker_client.h" 48 #include "chromeos/dbus/fake_permission_broker_client.h"
49 #include "chromeos/dbus/fake_shill_device_client.h" 49 #include "chromeos/dbus/fake_shill_device_client.h"
50 #include "chromeos/dbus/fake_shill_ipconfig_client.h" 50 #include "chromeos/dbus/fake_shill_ipconfig_client.h"
51 #include "chromeos/dbus/fake_shill_manager_client.h" 51 #include "chromeos/dbus/fake_shill_manager_client.h"
52 #include "chromeos/dbus/fake_shill_profile_client.h" 52 #include "chromeos/dbus/fake_shill_profile_client.h"
53 #include "chromeos/dbus/fake_shill_service_client.h" 53 #include "chromeos/dbus/fake_shill_service_client.h"
54 #include "chromeos/dbus/fake_shill_third_party_vpn_driver_client.h"
54 #include "chromeos/dbus/fake_sms_client.h" 55 #include "chromeos/dbus/fake_sms_client.h"
55 #include "chromeos/dbus/fake_system_clock_client.h" 56 #include "chromeos/dbus/fake_system_clock_client.h"
56 #include "chromeos/dbus/gsm_sms_client.h" 57 #include "chromeos/dbus/gsm_sms_client.h"
57 #include "chromeos/dbus/image_burner_client.h" 58 #include "chromeos/dbus/image_burner_client.h"
58 #include "chromeos/dbus/introspectable_client.h" 59 #include "chromeos/dbus/introspectable_client.h"
59 #include "chromeos/dbus/lorgnette_manager_client.h" 60 #include "chromeos/dbus/lorgnette_manager_client.h"
60 #include "chromeos/dbus/modem_messaging_client.h" 61 #include "chromeos/dbus/modem_messaging_client.h"
61 #include "chromeos/dbus/nfc_adapter_client.h" 62 #include "chromeos/dbus/nfc_adapter_client.h"
62 #include "chromeos/dbus/nfc_device_client.h" 63 #include "chromeos/dbus/nfc_device_client.h"
63 #include "chromeos/dbus/nfc_manager_client.h" 64 #include "chromeos/dbus/nfc_manager_client.h"
64 #include "chromeos/dbus/nfc_record_client.h" 65 #include "chromeos/dbus/nfc_record_client.h"
65 #include "chromeos/dbus/nfc_tag_client.h" 66 #include "chromeos/dbus/nfc_tag_client.h"
66 #include "chromeos/dbus/permission_broker_client.h" 67 #include "chromeos/dbus/permission_broker_client.h"
67 #include "chromeos/dbus/power_manager_client.h" 68 #include "chromeos/dbus/power_manager_client.h"
68 #include "chromeos/dbus/power_policy_controller.h" 69 #include "chromeos/dbus/power_policy_controller.h"
69 #include "chromeos/dbus/session_manager_client.h" 70 #include "chromeos/dbus/session_manager_client.h"
70 #include "chromeos/dbus/shill_device_client.h" 71 #include "chromeos/dbus/shill_device_client.h"
71 #include "chromeos/dbus/shill_ipconfig_client.h" 72 #include "chromeos/dbus/shill_ipconfig_client.h"
72 #include "chromeos/dbus/shill_manager_client.h" 73 #include "chromeos/dbus/shill_manager_client.h"
73 #include "chromeos/dbus/shill_profile_client.h" 74 #include "chromeos/dbus/shill_profile_client.h"
74 #include "chromeos/dbus/shill_service_client.h" 75 #include "chromeos/dbus/shill_service_client.h"
76 #include "chromeos/dbus/shill_third_party_vpn_driver_client.h"
75 #include "chromeos/dbus/sms_client.h" 77 #include "chromeos/dbus/sms_client.h"
76 #include "chromeos/dbus/system_clock_client.h" 78 #include "chromeos/dbus/system_clock_client.h"
77 #include "chromeos/dbus/update_engine_client.h" 79 #include "chromeos/dbus/update_engine_client.h"
78 80
79 namespace chromeos { 81 namespace chromeos {
80 82
81 namespace { 83 namespace {
82 84
83 // Command line switch mapping for --dbus-unstub-clients. 85 // Command line switch mapping for --dbus-unstub-clients.
84 const struct { 86 const struct {
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 lorgnette_manager_client_.reset(LorgnetteManagerClient::Create()); 182 lorgnette_manager_client_.reset(LorgnetteManagerClient::Create());
181 else 183 else
182 lorgnette_manager_client_.reset(new FakeLorgnetteManagerClient); 184 lorgnette_manager_client_.reset(new FakeLorgnetteManagerClient);
183 185
184 if (!IsUsingStub(SHILL)) { 186 if (!IsUsingStub(SHILL)) {
185 shill_manager_client_.reset(ShillManagerClient::Create()); 187 shill_manager_client_.reset(ShillManagerClient::Create());
186 shill_device_client_.reset(ShillDeviceClient::Create()); 188 shill_device_client_.reset(ShillDeviceClient::Create());
187 shill_ipconfig_client_.reset(ShillIPConfigClient::Create()); 189 shill_ipconfig_client_.reset(ShillIPConfigClient::Create());
188 shill_service_client_.reset(ShillServiceClient::Create()); 190 shill_service_client_.reset(ShillServiceClient::Create());
189 shill_profile_client_.reset(ShillProfileClient::Create()); 191 shill_profile_client_.reset(ShillProfileClient::Create());
192 shill_third_party_vpn_driver_client_.reset(
193 ShillThirdPartyVpnDriverClient::Create());
190 } else { 194 } else {
191 shill_manager_client_.reset(new FakeShillManagerClient); 195 shill_manager_client_.reset(new FakeShillManagerClient);
192 shill_device_client_.reset(new FakeShillDeviceClient); 196 shill_device_client_.reset(new FakeShillDeviceClient);
193 shill_ipconfig_client_.reset(new FakeShillIPConfigClient); 197 shill_ipconfig_client_.reset(new FakeShillIPConfigClient);
194 shill_service_client_.reset(new FakeShillServiceClient); 198 shill_service_client_.reset(new FakeShillServiceClient);
195 shill_profile_client_.reset(new FakeShillProfileClient); 199 shill_profile_client_.reset(new FakeShillProfileClient);
200 shill_third_party_vpn_driver_client_.reset(
201 new FakeShillThirdPartyVpnDriverClient);
196 } 202 }
197 203
198 if (!IsUsingStub(GSM_SMS)) { 204 if (!IsUsingStub(GSM_SMS)) {
199 gsm_sms_client_.reset(GsmSMSClient::Create()); 205 gsm_sms_client_.reset(GsmSMSClient::Create());
200 } else { 206 } else {
201 FakeGsmSMSClient* gsm_sms_client = new FakeGsmSMSClient(); 207 FakeGsmSMSClient* gsm_sms_client = new FakeGsmSMSClient();
202 gsm_sms_client->set_sms_test_message_switch_present( 208 gsm_sms_client->set_sms_test_message_switch_present(
203 CommandLine::ForCurrentProcess()->HasSwitch( 209 CommandLine::ForCurrentProcess()->HasSwitch(
204 chromeos::switches::kSmsTestMessages)); 210 chromeos::switches::kSmsTestMessages));
205 gsm_sms_client_.reset(gsm_sms_client); 211 gsm_sms_client_.reset(gsm_sms_client);
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 unstub_mask |= client; 306 unstub_mask |= client;
301 } else { 307 } else {
302 LOG(ERROR) << "Unknown dbus client: " << *iter; 308 LOG(ERROR) << "Unknown dbus client: " << *iter;
303 } 309 }
304 } 310 }
305 311
306 return unstub_mask; 312 return unstub_mask;
307 } 313 }
308 314
309 } // namespace chromeos 315 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698