Refactoring bluetooth API code.

chrome/browser/chromeos/extensions/bluetooth_event_router.cc

Index: chrome/browser/chromeos/extensions/bluetooth_event_router.cc
diff --git a/chrome/browser/chromeos/extensions/bluetooth_event_router.cc b/chrome/browser/chromeos/extensions/bluetooth_event_router.cc
index 9aa5fc30786d7a69d61031b51d118eb5c140eee2..0892a266f462f13a848c487fda9ad2f896e63327 100644
--- a/chrome/browser/chromeos/extensions/bluetooth_event_router.cc
+++ b/chrome/browser/chromeos/extensions/bluetooth_event_router.cc
@@ -10,9 +10,9 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h"
-#include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
-#include "chrome/browser/chromeos/bluetooth/bluetooth_socket.h"
+#include "chrome/browser/chromeos/bluetooth/bluetooth_adapter_dbus.h"
+#include "chrome/browser/chromeos/bluetooth/bluetooth_device_dbus.h"
+#include "chrome/browser/chromeos/bluetooth/bluetooth_socket_posix.h"
 #include "chrome/browser/extensions/api/bluetooth/bluetooth_api_utils.h"
 #include "chrome/browser/extensions/event_names.h"
 #include "chrome/browser/extensions/event_router.h"
@@ -24,7 +24,7 @@ namespace chromeos {
 
 ExtensionBluetoothEventRouter::ExtensionBluetoothEventRouter(Profile* profile)
     : profile_(profile),
-      adapter_(chromeos::BluetoothAdapter::DefaultAdapter()),
+      adapter_(chromeos::BluetoothAdapterDBus::DefaultAdapter()),
       next_socket_id_(1) {
   DCHECK(profile_);
   DCHECK(adapter_.get());
@@ -37,7 +37,7 @@ ExtensionBluetoothEventRouter::~ExtensionBluetoothEventRouter() {
 }
 
 int ExtensionBluetoothEventRouter::RegisterSocket(
-    scoped_refptr<BluetoothSocket> socket) {
+    scoped_refptr<BluetoothSocketPosix> socket) {
   // If there is a socket registered with the same fd, just return it's id
   for (SocketMap::const_iterator i = socket_map_.begin();
       i != socket_map_.end(); ++i) {
@@ -58,7 +58,7 @@ bool ExtensionBluetoothEventRouter::ReleaseSocket(int id) {
   return true;
 }
 
-scoped_refptr<BluetoothSocket> ExtensionBluetoothEventRouter::GetSocket(
+scoped_refptr<BluetoothSocketPosix> ExtensionBluetoothEventRouter::GetSocket(
     int id) {
   SocketMap::iterator socket_entry = socket_map_.find(id);
   if (socket_entry == socket_map_.end())
@@ -89,7 +89,7 @@ void ExtensionBluetoothEventRouter::SetSendDiscoveryEvents(bool should_send) {
 }
 
 void ExtensionBluetoothEventRouter::AdapterPresentChanged(
-    chromeos::BluetoothAdapter* adapter, bool present) {
+    chromeos::BluetoothAdapterDBus* adapter, bool present) {
   if (adapter != adapter_.get()) {
     DVLOG(1) << "Ignoring event for adapter " << adapter->address();
     return;
@@ -101,7 +101,7 @@ void ExtensionBluetoothEventRouter::AdapterPresentChanged(
 }
 
 void ExtensionBluetoothEventRouter::AdapterPoweredChanged(
-    chromeos::BluetoothAdapter* adapter, bool has_power) {
+    chromeos::BluetoothAdapterDBus* adapter, bool has_power) {
   if (adapter != adapter_.get()) {
     DVLOG(1) << "Ignoring event for adapter " << adapter->address();
     return;
@@ -113,7 +113,7 @@ void ExtensionBluetoothEventRouter::AdapterPoweredChanged(
 }
 
 void ExtensionBluetoothEventRouter::AdapterDiscoveringChanged(
-    chromeos::BluetoothAdapter* adapter, bool discovering) {
+    chromeos::BluetoothAdapterDBus* adapter, bool discovering) {
   if (adapter != adapter_.get()) {
     DVLOG(1) << "Ignoring event for adapter " << adapter->address();
     return;
@@ -131,7 +131,8 @@ void ExtensionBluetoothEventRouter::AdapterDiscoveringChanged(
 }
 
 void ExtensionBluetoothEventRouter::DeviceAdded(
-    chromeos::BluetoothAdapter* adapter, chromeos::BluetoothDevice* device) {
+    chromeos::BluetoothAdapterDBus* adapter,
+    chromeos::BluetoothDeviceDBus* device) {
   if (adapter != adapter_.get()) {
     DVLOG(1) << "Ignoring event for adapter " << adapter->address();
     return;