diff options
| author | kaliamoorthi <kaliamoorthi@chromium.org> | 2015-03-13 04:49:09 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-13 11:49:44 +0000 |
| commit | 029e52b57315ef4814988681541fd7d3561a8777 (patch) | |
| tree | ac3dc57858d3b3d4aa82b32b6fe44c44a775c828 /chromeos | |
| parent | b2f791d047b4d0b50821f483c77749314cf19d26 (diff) | |
| download | chromium_src-029e52b57315ef4814988681541fd7d3561a8777.zip chromium_src-029e52b57315ef4814988681541fd7d3561a8777.tar.gz chromium_src-029e52b57315ef4814988681541fd7d3561a8777.tar.bz2 | |
Add browser tests for vpnProvider
This CL adds a browser test for chrome.vpnProvider extension API.
BUG=461814
Review URL: https://codereview.chromium.org/979853002
Cr-Commit-Position: refs/heads/master@{#320486}
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/dbus/dbus_thread_manager.cc | 6 | ||||
| -rw-r--r-- | chromeos/dbus/dbus_thread_manager.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/chromeos/dbus/dbus_thread_manager.cc b/chromeos/dbus/dbus_thread_manager.cc index 8e705f4..a00a6f6 100644 --- a/chromeos/dbus/dbus_thread_manager.cc +++ b/chromeos/dbus/dbus_thread_manager.cc @@ -593,6 +593,12 @@ void DBusThreadManagerSetter::SetShillProfileClient( client.Pass(); } +void DBusThreadManagerSetter::SetShillThirdPartyVpnDriverClient( + scoped_ptr<ShillThirdPartyVpnDriverClient> client) { + DBusThreadManager::Get() + ->client_bundle_->shill_third_party_vpn_driver_client_ = client.Pass(); +} + void DBusThreadManagerSetter::SetGsmSMSClient( scoped_ptr<GsmSMSClient> client) { DBusThreadManager::Get()->client_bundle_->gsm_sms_client_ = client.Pass(); diff --git a/chromeos/dbus/dbus_thread_manager.h b/chromeos/dbus/dbus_thread_manager.h index 6f9a85b..a67f548 100644 --- a/chromeos/dbus/dbus_thread_manager.h +++ b/chromeos/dbus/dbus_thread_manager.h @@ -236,6 +236,8 @@ class CHROMEOS_EXPORT DBusThreadManagerSetter { void SetShillManagerClient(scoped_ptr<ShillManagerClient> client); void SetShillServiceClient(scoped_ptr<ShillServiceClient> client); void SetShillProfileClient(scoped_ptr<ShillProfileClient> client); + void SetShillThirdPartyVpnDriverClient( + scoped_ptr<ShillThirdPartyVpnDriverClient> client); void SetGsmSMSClient(scoped_ptr<GsmSMSClient> client); void SetImageBurnerClient(scoped_ptr<ImageBurnerClient> client); void SetIntrospectableClient(scoped_ptr<IntrospectableClient> client); |