arc: Revamp the ArcBridgeService interface

components/arc/bluetooth/arc_bluetooth_bridge.h

 // Copyright 2016 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 COMPONENTS_ARC_BLUETOOTH_ARC_BLUETOOTH_BRIDGE_H_
 #define COMPONENTS_ARC_BLUETOOTH_ARC_BLUETOOTH_BRIDGE_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/arc_service.h"
 #include "components/arc/common/bluetooth.mojom.h"
+#include "components/arc/instance_holder.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "device/bluetooth/bluetooth_discovery_session.h"
 #include "device/bluetooth/bluetooth_remote_gatt_characteristic.h"
 #include "device/bluetooth/bluetooth_remote_gatt_descriptor.h"
 #include "device/bluetooth/bluetooth_remote_gatt_service.h"
 #include "device/bluetooth/bluez/bluetooth_adapter_bluez.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace arc {
 
 class ArcBridgeService;
 
 class ArcBluetoothBridge
     : public ArcService,
-      public ArcBridgeService::Observer,
+      public InstanceHolder<mojom::BluetoothInstance>::Observer,
       public device::BluetoothAdapter::Observer,
       public device::BluetoothAdapterFactory::AdapterCallback,
       public mojom::BluetoothHost {
  public:
   explicit ArcBluetoothBridge(ArcBridgeService* bridge_service);
   ~ArcBluetoothBridge() override;
 
-  // Overridden from ArcBridgeService::Observer:
-  void OnBluetoothInstanceReady() override;
+  // Overridden from
+  // InstanceHolder<mojom::BluetoothInstance>::Observer:
+  void OnInstanceReady() override;
 
   void OnAdapterInitialized(scoped_refptr<device::BluetoothAdapter> adapter);
 
   // Overridden from device::BluetoothAdadpter::Observer
   void AdapterPoweredChanged(device::BluetoothAdapter* adapter,
                              bool powered) override;
 
   void DeviceAdded(device::BluetoothAdapter* adapter,
                    device::BluetoothDevice* device) override;
 
@@ skipping 199 matching lines @@
   mojo::Array<mojom::BluetoothPropertyPtr> GetDeviceProperties(
       mojom::BluetoothPropertyType type,
       device::BluetoothDevice* device) const;
   mojo::Array<mojom::BluetoothPropertyPtr> GetAdapterProperties(
       mojom::BluetoothPropertyType type) const;
   mojo::Array<mojom::BluetoothAdvertisingDataPtr> GetAdvertisingData(
       device::BluetoothDevice* device) const;
 
   void SendCachedDevicesFound() const;
   bool HasBluetoothInstance() const;
-  bool CheckBluetoothInstanceVersion(int32_t version_need) const;
+  bool CheckBluetoothInstanceVersion(uint32_t version_need) const;
 
   template <class T>
   T* FindGattObjectFromUuid(const std::vector<T*> objs,
                             const device::BluetoothUUID uuid) const;
   device::BluetoothRemoteGattCharacteristic* FindGattCharacteristic(
       mojom::BluetoothAddressPtr remote_addr,
       mojom::BluetoothGattServiceIDPtr service_id,
       mojom::BluetoothGattIDPtr char_id) const;
 
   device::BluetoothRemoteGattDescriptor* FindGattDescriptor(
@@ skipping 15 matching lines @@
 
   // WeakPtrFactory to use for callbacks.
   base::WeakPtrFactory<ArcBluetoothBridge> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcBluetoothBridge);
 };
 
 }  // namespace arc
 
 #endif  // COMPONENTS_ARC_BLUETOOTH_ARC_BLUETOOTH_BRIDGE_H_