bluetooth: Add adapter to BluetoothDevice

device/bluetooth/bluetooth_device_android.cc

 // 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.
 
 #include "device/bluetooth/bluetooth_device_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
+#include "device/bluetooth/bluetooth_adapter_android.h"
 #include "jni/ChromeBluetoothDevice_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::AppendJavaStringArrayToStringVector;
 
 namespace device {
 
 BluetoothDeviceAndroid* BluetoothDeviceAndroid::Create(
+    BluetoothAdapterAndroid* adapter,
     jobject bluetooth_device_wrapper) {  // Java Type: bluetoothDeviceWrapper
-  BluetoothDeviceAndroid* device = new BluetoothDeviceAndroid();
+  BluetoothDeviceAndroid* device = new BluetoothDeviceAndroid(adapter);
 
   device->j_device_.Reset(Java_ChromeBluetoothDevice_create(
       AttachCurrentThread(), bluetooth_device_wrapper));
 
   return device;
 }
 
 BluetoothDeviceAndroid::~BluetoothDeviceAndroid() {
 }
 
@@ skipping 152 matching lines @@
     const ConnectToServiceErrorCallback& error_callback) {
   NOTIMPLEMENTED();
 }
 
 void BluetoothDeviceAndroid::CreateGattConnection(
     const GattConnectionCallback& callback,
     const ConnectErrorCallback& error_callback) {
   NOTIMPLEMENTED();
 }
 
-BluetoothDeviceAndroid::BluetoothDeviceAndroid() {
-}
+BluetoothDeviceAndroid::BluetoothDeviceAndroid(BluetoothAdapterAndroid* adapter)
+    : BluetoothDevice(adapter) {}
 
 std::string BluetoothDeviceAndroid::GetDeviceName() const {
   return ConvertJavaStringToUTF8(Java_ChromeBluetoothDevice_getDeviceName(
       AttachCurrentThread(), j_device_.obj()));
 }
 
 }  // namespace device