Remove the ARC Bridge Service

chromeos/dbus/dbus_client_bundle.h

 // 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.
 
 #ifndef CHROMEOS_DBUS_DBUS_CLIENT_BUNDLE_H_
 #define CHROMEOS_DBUS_DBUS_CLIENT_BUNDLE_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "chromeos/chromeos_export.h"
 
 namespace chromeos {
 
 class AmplifierClient;
 class ApManagerClient;
-class ArcBridgeClient;
+class ArcInstanceClient;
 class AudioDspClient;
 class BluetoothAdapterClient;
 class BluetoothAgentManagerClient;
 class BluetoothDeviceClient;
 class BluetoothGattCharacteristicClient;
 class BluetoothGattDescriptorClient;
 class BluetoothGattManagerClient;
 class BluetoothGattServiceClient;
 class BluetoothInputClient;
 class BluetoothLEAdvertisingManagerClient;
@@ skipping 58 matching lines @@
     POWER_MANAGER =        1 << 14,
     SESSION_MANAGER =      1 << 15,
     SMS =                  1 << 16,
     SYSTEM_CLOCK =         1 << 17,
     UPDATE_ENGINE =        1 << 18,
     PEER_DAEMON =          1 << 19,
     AP_MANAGER =           1 << 20,
     PRIVET_DAEMON =        1 << 21,
     AMPLIFIER =            1 << 22,
     AUDIO_DSP =            1 << 23,
-    ARC_BRIDGE =           1 << 24,
+    ARC_INSTANCE =         1 << 24,
   };
 
   explicit DBusClientBundle(DBusClientTypeMask unstub_client_mask);
   ~DBusClientBundle();
 
   // Returns true if |client| is stubbed.
   bool IsUsingStub(DBusClientType client);
 
   // Returns true if any real DBusClient is used.
   bool IsUsingAnyRealClient();
 
   // Initialize proper runtime environment for its dbus clients.
   void SetupDefaultEnvironment();
 
   // Parses command line param values for dbus subsystem that should be
   // un-stubbed.
   static DBusClientTypeMask ParseUnstubList(const std::string& unstub_list);
 
   AmplifierClient* amplifier_client() { return amplifier_client_.get(); }
 
   ApManagerClient* ap_manager_client() { return ap_manager_client_.get(); }
 
-  ArcBridgeClient* arc_bridge_client() { return arc_bridge_client_.get(); }
+  ArcInstanceClient* arc_instance_client() {
+    return arc_instance_client_.get();
+  }
 
   AudioDspClient* audio_dsp_client() { return audio_dsp_client_.get(); }
 
   BluetoothAdapterClient* bluetooth_adapter_client() {
     return bluetooth_adapter_client_.get();
   }
 
   BluetoothLEAdvertisingManagerClient*
   bluetooth_le_advertising_manager_client() {
     return bluetooth_le_advertising_manager_client_.get();
@@ skipping 157 matching lines @@
 
  private:
   friend class DBusThreadManagerSetter;
 
   // Bitmask that defines which dbus clients are not stubbed out. Bitmap flags
   // are defined within DBusClientType enum.
   DBusClientTypeMask unstub_client_mask_;
 
   scoped_ptr<AmplifierClient> amplifier_client_;
   scoped_ptr<ApManagerClient> ap_manager_client_;
-  scoped_ptr<ArcBridgeClient> arc_bridge_client_;
+  scoped_ptr<ArcInstanceClient> arc_instance_client_;
   scoped_ptr<AudioDspClient> audio_dsp_client_;
   scoped_ptr<BluetoothAdapterClient> bluetooth_adapter_client_;
   scoped_ptr<BluetoothLEAdvertisingManagerClient>
       bluetooth_le_advertising_manager_client_;
   scoped_ptr<BluetoothAgentManagerClient> bluetooth_agent_manager_client_;
   scoped_ptr<BluetoothDeviceClient> bluetooth_device_client_;
   scoped_ptr<BluetoothGattCharacteristicClient>
       bluetooth_gatt_characteristic_client_;
   scoped_ptr<BluetoothGattDescriptorClient> bluetooth_gatt_descriptor_client_;
   scoped_ptr<BluetoothGattManagerClient> bluetooth_gatt_manager_client_;
@@ skipping 34 matching lines @@
   scoped_ptr<SessionManagerClient> session_manager_client_;
   scoped_ptr<SMSClient> sms_client_;
   scoped_ptr<UpdateEngineClient> update_engine_client_;
 
   DISALLOW_COPY_AND_ASSIGN(DBusClientBundle);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_DBUS_CLIENT_BUNDLE_H_