Refactoring bluetooth API code.

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

Index: chrome/browser/extensions/api/bluetooth/bluetooth_api.cc
diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc
index ea750a3ae14d92fc51903aaf8ac35bf920519872..85f102ab677448313376d222b385031ec7dca263 100644
--- a/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc
+++ b/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc
@@ -22,10 +22,12 @@
 #include "base/safe_strerror_posix.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
+#include "chrome/browser/chromeos/bluetooth/bluetooth_service_record.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_socket.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_utils.h"
 #include "chrome/browser/chromeos/extensions/bluetooth_event_router.h"
 #include "chromeos/dbus/bluetooth_out_of_band_client.h"
+#include "chromeos/dbus/bluetooth_out_of_band_pairing_data.h"
 
 namespace {
 
@@ -110,8 +112,7 @@ void BluetoothGetDevicesFunction::DispatchDeviceSearchResult(
 }
 
 void BluetoothGetDevicesFunction::ProvidesServiceCallback(
-    const chromeos::BluetoothDevice* device,
-    bool providesService) {
+    const chromeos::BluetoothDevice* device, bool providesService) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   CHECK(device);
@@ -144,7 +145,7 @@ bool BluetoothGetDevicesFunction::RunImpl() {
   chromeos::BluetoothAdapter::DeviceList devices =
       GetMutableAdapter(profile())->GetDevices();
   for (chromeos::BluetoothAdapter::DeviceList::iterator i = devices.begin();
-      i != devices.end(); ++i) {
+       i != devices.end(); ++i) {

[keybuk, 2012/09/13 23:57:30]

what happened here? (x2)

[youngki, 2012/09/17 21:53:02]

I aligned the second line to the one character next to the bracket. I believe
that's part of the C++ style guide (let me know if it's otherwise)

     chromeos::BluetoothDevice* device = *i;
     CHECK(device);
 
@@ -178,7 +179,7 @@ void BluetoothGetServicesFunction::GetServiceRecordsCallback(
     base::ListValue* services,
     const chromeos::BluetoothDevice::ServiceRecordList& records) {
   for (chromeos::BluetoothDevice::ServiceRecordList::const_iterator i =
-      records.begin(); i != records.end(); ++i) {
+       records.begin(); i != records.end(); ++i) {
     const chromeos::BluetoothServiceRecord& record = **i;
     experimental_bluetooth::ServiceRecord api_record;
     api_record.name = record.name();