Refactoring bluetooth API code.

chrome/browser/chromeos/bluetooth/bluetooth_service_record_dbus.h

Index: chrome/browser/chromeos/bluetooth/bluetooth_service_record_dbus.h
diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_service_record.h b/chrome/browser/chromeos/bluetooth/bluetooth_service_record_dbus.h
similarity index 72%
rename from chrome/browser/chromeos/bluetooth/bluetooth_service_record.h
rename to chrome/browser/chromeos/bluetooth/bluetooth_service_record_dbus.h
index 03a32323198ae9cea5743f816d6701585e5c40dc..604b89a780c84f468507db3f29ab42ebf5e13ed0 100644
--- a/chrome/browser/chromeos/bluetooth/bluetooth_service_record.h
+++ b/chrome/browser/chromeos/bluetooth/bluetooth_service_record_dbus.h
@@ -2,36 +2,39 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_SERVICE_RECORD_H_
-#define CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_SERVICE_RECORD_H_
+#ifndef CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_SERVICE_RECORD_DBUS_H_
+#define CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_SERVICE_RECORD_DBUS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
+#include "chrome/browser/chromeos/bluetooth/bluetooth_service_record_interface.h"
 
 class XmlReader;
 
 namespace chromeos {
 
-// The BluetoothServiceRecord represents an SDP service record.
+// The BluetoothServiceRecordDBus class is an implementation of
+// BluetoothServiceRecordInterface using DBus for Linux/ChromeOS platform.

[bryeung, 2012/09/07 18:35:57]

I think that the XML format is actually dictated by the Bluetooth Spec (i.e.
this might actually be platform independent).

Please verify that this is true, and just leave a comment to the XML spec here
(if you can find one).  (And obviously undo the renaming.)

[youngki, 2012/09/13 18:05:02]

I think the logic in this file is pretty much about processing XML data, so I
think we can reuse this in windows platform as well. I also verified that
third_party/libxml compiles in Windows too. I renamed this file back to
bluetooth_service_record.{h|cc} and also BluetoothServiceRecord as well.

 //
 // This implementation is currently incomplete: it only supports those fields
 // that have been necessary so far.
-class BluetoothServiceRecord {
+class BluetoothServiceRecordDBus : public BluetoothServiceRecordInterface {
  public:
-   BluetoothServiceRecord(
+   BluetoothServiceRecordDBus(
        const std::string& address,
        const std::string& xml_data);
 
    // The human-readable name of this service.
-   const std::string& name() const { return name_; }
-
-   // The address of the BluetoothDevice providing this service.
-   const std::string& address() const { return address_; }
+   virtual const std::string& name() const OVERRIDE;
 
    // The UUID of the service.  This field may be empty if no UUID was
    // specified in the service record.
-   const std::string& uuid() const { return uuid_; }
+   virtual const std::string& uuid() const OVERRIDE;
+
+   // The address of the BluetoothDevice providing this service.
+   const std::string& address() const { return address_; }
 
    // Indicates if this service supports RFCOMM communication.
    bool SupportsRfcomm() const { return supports_rfcomm_; }
@@ -51,9 +54,9 @@ class BluetoothServiceRecord {
   bool supports_rfcomm_;
   uint8_t rfcomm_channel_;
 
-  DISALLOW_COPY_AND_ASSIGN(BluetoothServiceRecord);
+  DISALLOW_COPY_AND_ASSIGN(BluetoothServiceRecordDBus);
 };
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_SERVICE_RECORD_H_
+#endif  // CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_SERVICE_RECORD_DBUS_H_