Refactoring bluetooth API code.

chrome/browser/extensions/api/bluetooth/bluetooth_api.h

Index: chrome/browser/extensions/api/bluetooth/bluetooth_api.h
diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_api.h b/chrome/browser/extensions/api/bluetooth/bluetooth_api.h
index c918ebc9dc6ff7b414cc38d27682bc0e07660a62..b9782b4fa84e1740150e1f3c09c65f92d7846dda 100644
--- a/chrome/browser/extensions/api/bluetooth/bluetooth_api.h
+++ b/chrome/browser/extensions/api/bluetooth/bluetooth_api.h
@@ -12,12 +12,12 @@
 
 #if defined(OS_CHROMEOS)
 #include "base/memory/ref_counted.h"
-#include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
-#include "chrome/browser/chromeos/bluetooth/bluetooth_socket.h"
+#include "chrome/browser/chromeos/bluetooth/bluetooth_device_interface.h"
+#include "chrome/browser/chromeos/bluetooth/bluetooth_socket_posix.h"
 
 namespace chromeos {
 
-class BluetoothSocket;
+class BluetoothSocketPosix;
 struct BluetoothOutOfBandPairingData;
 
 }  // namespace chromeos
@@ -87,7 +87,7 @@ class BluetoothGetDevicesFunction : public AsyncExtensionFunction {
  private:
 #if defined(OS_CHROMEOS)
   void AddDeviceIfTrueCallback(ListValue* list,
-                               const chromeos::BluetoothDevice* device,
+                               const chromeos::BluetoothDeviceInterface* device,
                                bool shouldAdd);
 
   int callbacks_pending_;
@@ -108,7 +108,7 @@ class BluetoothGetServicesFunction : public AsyncExtensionFunction {
  private:
   void GetServiceRecordsCallback(
       base::ListValue* services,
-      const chromeos::BluetoothDevice::ServiceRecordList& records);
+      const chromeos::BluetoothDeviceInterface::ServiceRecordList& records);
   void OnErrorCallback();
 #endif
 };
@@ -125,9 +125,9 @@ class BluetoothConnectFunction : public AsyncExtensionFunction {
  private:
 #if defined(OS_CHROMEOS)
   void ConnectToServiceCallback(
-      const chromeos::BluetoothDevice* device,
+      const chromeos::BluetoothDeviceInterface* device,
       const std::string& service_uuid,
-      scoped_refptr<chromeos::BluetoothSocket> socket);
+      scoped_refptr<chromeos::BluetoothSocketPosix> socket);
 #endif
 };
 
@@ -158,7 +158,7 @@ class BluetoothReadFunction : public AsyncApiFunction {
  private:
 #if defined(OS_CHROMEOS)
   bool success_;
-  scoped_refptr<chromeos::BluetoothSocket> socket_;
+  scoped_refptr<chromeos::BluetoothSocketPosix> socket_;
 #endif
 };
 
@@ -179,7 +179,7 @@ class BluetoothWriteFunction : public AsyncApiFunction {
 #if defined(OS_CHROMEOS)
   bool success_;
   const base::BinaryValue* data_to_write_;  // memory is owned by args_
-  scoped_refptr<chromeos::BluetoothSocket> socket_;
+  scoped_refptr<chromeos::BluetoothSocketPosix> socket_;
 #endif
 };