| Index: chromeos/dbus/dbus_thread_manager.cc
|
| diff --git a/chromeos/dbus/dbus_thread_manager.cc b/chromeos/dbus/dbus_thread_manager.cc
|
| index af03c1fc4d046b8d72d9c77e694e88f6cb0e72e5..ad09009f2e54c700ff46cc1e942cf001e939a559 100644
|
| --- a/chromeos/dbus/dbus_thread_manager.cc
|
| +++ b/chromeos/dbus/dbus_thread_manager.cc
|
| @@ -10,7 +10,7 @@
|
| #include "chromeos/chromeos_switches.h"
|
| #include "chromeos/dbus/amplifier_client.h"
|
| #include "chromeos/dbus/ap_manager_client.h"
|
| -#include "chromeos/dbus/arc_bridge_client.h"
|
| +#include "chromeos/dbus/arc_instance_client.h"
|
| #include "chromeos/dbus/audio_dsp_client.h"
|
| #include "chromeos/dbus/bluetooth_adapter_client.h"
|
| #include "chromeos/dbus/bluetooth_agent_manager_client.h"
|
| @@ -120,8 +120,8 @@ AmplifierClient* DBusThreadManager::GetAmplifierClient() {
|
| return client_bundle_->amplifier_client();
|
| }
|
|
|
| -ArcBridgeClient* DBusThreadManager::GetArcBridgeClient() {
|
| - return client_bundle_->arc_bridge_client();
|
| +ArcInstanceClient* DBusThreadManager::GetArcInstanceClient() {
|
| + return client_bundle_->arc_instance_client();
|
| }
|
|
|
| ApManagerClient* DBusThreadManager::GetApManagerClient() {
|
| @@ -312,7 +312,7 @@ UpdateEngineClient* DBusThreadManager::GetUpdateEngineClient() {
|
| void DBusThreadManager::InitializeClients() {
|
| GetAmplifierClient()->Init(GetSystemBus());
|
| GetApManagerClient()->Init(GetSystemBus());
|
| - GetArcBridgeClient()->Init(GetSystemBus());
|
| + GetArcInstanceClient()->Init(GetSystemBus());
|
| GetAudioDspClient()->Init(GetSystemBus());
|
| GetBluetoothAdapterClient()->Init(GetSystemBus());
|
| GetBluetoothAgentManagerClient()->Init(GetSystemBus());
|
| @@ -475,9 +475,10 @@ void DBusThreadManagerSetter::SetAmplifierClient(
|
| DBusThreadManager::Get()->client_bundle_->amplifier_client_ = client.Pass();
|
| }
|
|
|
| -void DBusThreadManagerSetter::SetArcBridgeClient(
|
| - scoped_ptr<ArcBridgeClient> client) {
|
| - DBusThreadManager::Get()->client_bundle_->arc_bridge_client_ = client.Pass();
|
| +void DBusThreadManagerSetter::SetArcInstanceClient(
|
| + scoped_ptr<ArcInstanceClient> client) {
|
| + DBusThreadManager::Get()->client_bundle_->arc_instance_client_ =
|
| + client.Pass();
|
| }
|
|
|
| void DBusThreadManagerSetter::SetAudioDspClient(
|
|
|