Separated BluetoothServiceRecord interface from BluetoothServiceRecordChromeOs.

device/bluetooth/bluetooth_device_chromeos.cc

 // Copyright (c) 2012 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_chromeos.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 10 matching lines @@
 #include "chromeos/dbus/bluetooth_device_client.h"
 #include "chromeos/dbus/bluetooth_input_client.h"
 #include "chromeos/dbus/bluetooth_out_of_band_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/introspectable_client.h"
 #include "dbus/bus.h"
 #include "dbus/object_path.h"
 #include "device/bluetooth/bluetooth_adapter_chromeos.h"
 #include "device/bluetooth/bluetooth_out_of_band_pairing_data.h"
 #include "device/bluetooth/bluetooth_service_record.h"
+#include "device/bluetooth/bluetooth_service_record_chromeos.h"
 #include "device/bluetooth/bluetooth_socket_chromeos.h"
 #include "device/bluetooth/bluetooth_utils.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 using device::BluetoothDevice;
 using device::BluetoothOutOfBandPairingData;
 using device::BluetoothServiceRecord;
+using device::BluetoothServiceRecordChromeOs;
 using device::BluetoothSocket;
 
 namespace chromeos {

[bryeung, 2013/01/14 20:21:46]

you declared BluetoothDeviceChromeOs in the device namespace...why are you
implementing it in the chromeos namespace?  seems inconsistent (and is in fact
inconsistent with BluetoothAdapter, for example)

[youngki, 2013/01/14 20:37:57]

Done.

 
 BluetoothDeviceChromeOs::BluetoothDeviceChromeOs(
     BluetoothAdapterChromeOs* adapter)
   : BluetoothDevice(),
     adapter_(adapter),
     pairing_delegate_(NULL),
     connecting_applications_counter_(0),
     weak_ptr_factory_(this) {
 }
 
@@ skipping 346 matching lines @@
     bool success) {
   if (!success) {
     error_callback.Run();
     return;
   }
 
   ScopedVector<BluetoothServiceRecord> records;
   for (BluetoothDeviceClient::ServiceMap::const_iterator i =
       service_map.begin(); i != service_map.end(); ++i) {
     records.push_back(
-        new BluetoothServiceRecord(address(), i->second));
+        new BluetoothServiceRecordChromeOs(address(), i->second));
   }
   callback.Run(records);
 }
 
 void BluetoothDeviceChromeOs::OnSetTrusted(const base::Closure& callback,
                                            const ErrorCallback& error_callback,
                                            bool success) {
   if (success) {
     callback.Run();
   } else {
@@ skipping 301 matching lines @@
 }
 
 
 // static
 BluetoothDeviceChromeOs* BluetoothDeviceChromeOs::Create(
     BluetoothAdapterChromeOs* adapter) {
   return new BluetoothDeviceChromeOs(adapter);
 }
 
 }  // namespace chromeos