Remove the ARC Bridge Service

chromeos/dbus/dbus_client_bundle.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/dbus/dbus_client_bundle.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #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"
 #include "chromeos/dbus/bluetooth_device_client.h"
 #include "chromeos/dbus/bluetooth_gatt_characteristic_client.h"
 #include "chromeos/dbus/bluetooth_gatt_descriptor_client.h"
 #include "chromeos/dbus/bluetooth_gatt_manager_client.h"
 #include "chromeos/dbus/bluetooth_gatt_service_client.h"
 #include "chromeos/dbus/bluetooth_input_client.h"
 #include "chromeos/dbus/bluetooth_le_advertising_manager_client.h"
 #include "chromeos/dbus/bluetooth_media_client.h"
 #include "chromeos/dbus/bluetooth_media_transport_client.h"
 #include "chromeos/dbus/bluetooth_profile_manager_client.h"
 #include "chromeos/dbus/cras_audio_client.h"
 #include "chromeos/dbus/cros_disks_client.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/debug_daemon_client.h"
 #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"
 #include "chromeos/dbus/fake_bluetooth_device_client.h"
 #include "chromeos/dbus/fake_bluetooth_gatt_characteristic_client.h"
 #include "chromeos/dbus/fake_bluetooth_gatt_descriptor_client.h"
 #include "chromeos/dbus/fake_bluetooth_gatt_manager_client.h"
 #include "chromeos/dbus/fake_bluetooth_gatt_service_client.h"
 #include "chromeos/dbus/fake_bluetooth_input_client.h"
 #include "chromeos/dbus/fake_bluetooth_le_advertising_manager_client.h"
@@ skipping 55 matching lines @@
 
 namespace {
 
 // Command line switch mapping for --dbus-unstub-clients.
 const struct {
   const char* param_name;
   DBusClientBundle::DBusClientType client_type;
 } 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 },
     { "cros_disks",  DBusClientBundle::CROS_DISKS },
     { "cryptohome",  DBusClientBundle::CRYPTOHOME },
     { "debug_daemon",  DBusClientBundle::DEBUG_DAEMON },
     { "easy_unlock",  DBusClientBundle::EASY_UNLOCK },
     { "lorgnette_manager",  DBusClientBundle::LORGNETTE_MANAGER },
     { "shill",  DBusClientBundle::SHILL },
     { "gsm_sms",  DBusClientBundle::GSM_SMS },
@@ skipping 25 matching lines @@
 
 }  // namespace
 
 DBusClientBundle::DBusClientBundle(DBusClientTypeMask unstub_client_mask)
     : unstub_client_mask_(unstub_client_mask) {
   if (!IsUsingStub(AMPLIFIER))
     amplifier_client_.reset(AmplifierClient::Create());
   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());
   else
     audio_dsp_client_.reset(new FakeAudioDspClient);
 
   if (!IsUsingStub(BLUETOOTH)) {
     bluetooth_adapter_client_.reset(BluetoothAdapterClient::Create());
     bluetooth_le_advertising_manager_client_.reset(
         BluetoothLEAdvertisingManagerClient::Create());
@@ skipping 196 matching lines @@
       unstub_mask |= client;
     } else {
       LOG(ERROR) << "Unknown dbus client: " << cur;
     }
   }
 
   return unstub_mask;
 }
 
 }  // namespace chromeos