bluetooth: Add adapter to BluetoothDevice

device/bluetooth/bluetooth_device_android.h

 // Copyright 2015 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 DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_ANDROID_H_
 #define DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_ANDROID_H_
 
 #include "base/android/jni_android.h"
 #include "base/memory/weak_ptr.h"
 #include "device/bluetooth/bluetooth_device.h"
 
 namespace device {
 
+class BluetoothAdapterAndroid;
+
 // BluetoothDeviceAndroid along with the Java class
-// org.chromium.device.bluetooth.BluetoothDevice implement BluetoothDevice.
+// org.chromium.device.bluetooth.ChromeBluetoothDevice implement
+// BluetoothDevice.
 class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceAndroid final
     : public BluetoothDevice {
  public:
   // Create a BluetoothDeviceAndroid instance and associated Java
   // ChromeBluetoothDevice using the provided |java_bluetooth_device_wrapper|.
   //
   // The ChromeBluetoothDevice instance will hold a Java reference
   // to |bluetooth_device_wrapper|.
   //
   // TODO(scheib): Return a scoped_ptr<>, but then adapter will need to handle
   // this correctly. http://crbug.com/506416
   static BluetoothDeviceAndroid* Create(
+      BluetoothAdapterAndroid* adapter,
       jobject bluetooth_device_wrapper);  // Java Type: bluetoothDeviceWrapper
 
   ~BluetoothDeviceAndroid() override;
 
   // Register C++ methods exposed to Java using JNI.
   static bool RegisterJNI(JNIEnv* env);
 
   // Updates cached copy of advertised UUIDs discovered during a scan.
   // Returns true if new UUIDs differed from cached values.
   bool UpdateAdvertisedUUIDs(
@@ skipping 34 matching lines @@
       const ConnectToServiceErrorCallback& error_callback) override;
   void ConnectToServiceInsecurely(
       const device::BluetoothUUID& uuid,
       const ConnectToServiceCallback& callback,
       const ConnectToServiceErrorCallback& error_callback) override;
   void CreateGattConnection(
       const GattConnectionCallback& callback,
       const ConnectErrorCallback& error_callback) override;
 
  protected:
-  BluetoothDeviceAndroid();
+  BluetoothDeviceAndroid(BluetoothAdapterAndroid* adapter);
 
   // BluetoothDevice:
   std::string GetDeviceName() const override;
 
   // Java object org.chromium.device.bluetooth.ChromeBluetoothDevice.
   base::android::ScopedJavaGlobalRef<jobject> j_device_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothDeviceAndroid);
 };
 
 }  // namespace device
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_ANDROID_H_