bluetooth: Add adapter to BluetoothDevice

device/bluetooth/bluetooth_device_chromeos.h

 // Copyright 2013 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_CHROMEOS_H
 #define DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_CHROMEOS_H
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
@@ skipping 78 matching lines @@
   // be ignored.
   void EndPairing();
 
   // Returns the current pairing object or NULL if no pairing is in progress.
   BluetoothPairingChromeOS* GetPairing() const;
 
   // Returns the object path of the device.
   const dbus::ObjectPath& object_path() const { return object_path_; }
 
   // Returns the adapter which owns this device instance.
-  BluetoothAdapterChromeOS* adapter() const { return adapter_; }
+  BluetoothAdapterChromeOS* adapter() const;
 
  protected:
   // BluetoothDevice override
   std::string GetDeviceName() const override;
 
  private:
   friend class BluetoothAdapterChromeOS;
 
   BluetoothDeviceChromeOS(
       BluetoothAdapterChromeOS* adapter,
@@ skipping 56 matching lines @@
                          const std::string& error_name,
                          const std::string& error_message);
 
   // Called by dbus:: on failure of the D-Bus method call to unpair the device;
   // there is no matching completion call since this object is deleted in the
   // process of unpairing.
   void OnForgetError(const ErrorCallback& error_callback,
                      const std::string& error_name,
                      const std::string& error_message);
 
-  // The adapter that owns this device instance.
-  BluetoothAdapterChromeOS* adapter_;
-
   // The dbus object path of the device object.
   dbus::ObjectPath object_path_;
 
   // Number of ongoing calls to Connect().
   int num_connecting_calls_;
 
   // True if the connection monitor has been started, tracking the connection
   // RSSI and TX power.
   bool connection_monitor_started_;
 
   // UI thread task runner and socket thread object used to create sockets.
   scoped_refptr<base::SequencedTaskRunner> ui_task_runner_;
   scoped_refptr<device::BluetoothSocketThread> socket_thread_;
 
   // During pairing this is set to an object that we don't own, but on which
   // we can make method calls to request, display or confirm PIN Codes and
   // Passkeys. Generally it is the object that owns this one.
   scoped_ptr<BluetoothPairingChromeOS> pairing_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<BluetoothDeviceChromeOS> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothDeviceChromeOS);
 };
 
 }  // namespace chromeos
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_CHROMEOS_H