Remove the ARC Bridge Service

chromeos/dbus/dbus_client_bundle.cc

Index: chromeos/dbus/dbus_client_bundle.cc
diff --git a/chromeos/dbus/dbus_client_bundle.cc b/chromeos/dbus/dbus_client_bundle.cc
index 941bec69356d3388e8c43be0966d2d7eb7eef1b3..4f55b143f8b2375f4a5af0edbd8f93feed8d8e3a 100644
--- a/chromeos/dbus/dbus_client_bundle.cc
+++ b/chromeos/dbus/dbus_client_bundle.cc
@@ -12,7 +12,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"
@@ -33,7 +33,7 @@
 #include "chromeos/dbus/easy_unlock_client.h"
 #include "chromeos/dbus/fake_amplifier_client.h"
 #include "chromeos/dbus/fake_ap_manager_client.h"
-#include "chromeos/dbus/fake_arc_bridge_client.h"
+#include "chromeos/dbus/fake_arc_instance_client.h"
 #include "chromeos/dbus/fake_audio_dsp_client.h"
 #include "chromeos/dbus/fake_bluetooth_adapter_client.h"
 #include "chromeos/dbus/fake_bluetooth_agent_manager_client.h"
@@ -109,7 +109,7 @@ const struct {
 } client_type_map[] = {
     { "amplifier",  DBusClientBundle::AMPLIFIER },
     { "ap",  DBusClientBundle::AP_MANAGER },
-    { "arc", DBusClientBundle::ARC_BRIDGE },
+    { "arc", DBusClientBundle::ARC_INSTANCE },
     { "audio_dsp",  DBusClientBundle::AUDIO_DSP },
     { "bluetooth",  DBusClientBundle::BLUETOOTH },
     { "cras",  DBusClientBundle::CRAS },
@@ -155,10 +155,10 @@ DBusClientBundle::DBusClientBundle(DBusClientTypeMask unstub_client_mask)
   else
     amplifier_client_.reset(new FakeAmplifierClient);
 
-  if (!IsUsingStub(ARC_BRIDGE))
-    arc_bridge_client_.reset(ArcBridgeClient::Create());
+  if (!IsUsingStub(ARC_INSTANCE))
+    arc_instance_client_.reset(ArcInstanceClient::Create());
   else
-    arc_bridge_client_.reset(new FakeArcBridgeClient);
+    arc_instance_client_.reset(new FakeArcInstanceClient);
 
   if (!IsUsingStub(AUDIO_DSP))
     audio_dsp_client_.reset(AudioDspClient::Create());