Refactoring bluetooth API code.

chrome/browser/chromeos/bluetooth/bluetooth_service_record_dbus.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 "chrome/browser/chromeos/bluetooth/bluetooth_service_record.h"
+#include "chrome/browser/chromeos/bluetooth/bluetooth_service_record_dbus.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_utils.h"
 #include "third_party/libxml/chromium/libxml_utils.h"
 
 namespace {
@@ skipping 23 matching lines @@
     reader->NodeAttribute(kValueAttribute, value_out);
     return true;
   }
   return false;
 }
 
 }  // namespace
 
 namespace chromeos {
 
-BluetoothServiceRecord::BluetoothServiceRecord(
+BluetoothServiceRecordDBus::BluetoothServiceRecordDBus(
     const std::string& address,
     const std::string& xml_data)
   : address_(address),
     supports_rfcomm_(false) {
 
   XmlReader reader;
   if (!reader.Load(xml_data))
     return;
 
   while (AdvanceToTag(&reader, kAttributeNode)) {
     std::string id;
     if (reader.NodeAttribute(kIdAttribute, &id)) {
       if (id == kSdpNameId) {
         ExtractTextValue(&reader, &name_);
       } else if (id == kProtocolDescriptorListId) {
         if (AdvanceToTag(&reader, kSequenceNode)) {
           ExtractChannels(&reader);
         }
       } else if (id == kUuidId) {
         if (AdvanceToTag(&reader, kSequenceNode)) {
           ExtractUuid(&reader);
         }
       }
     }
     // We don't care about anything else here, so find the closing tag
     AdvanceToTag(&reader, kAttributeNode);
   }
 }
 
-void BluetoothServiceRecord::ExtractChannels(XmlReader* reader) {
+const std::string& BluetoothServiceRecordDBus::name() const {
+  return name_;
+}
+
+const std::string& BluetoothServiceRecordDBus::uuid() const {
+  return uuid_;
+}
+
+void BluetoothServiceRecordDBus::ExtractChannels(XmlReader* reader) {
   const int start_depth = reader->Depth();
   do {
     if (reader->NodeName() == kSequenceNode) {
       if (AdvanceToTag(reader, kUuidNode)) {
         std::string type;
         if (reader->NodeAttribute(kValueAttribute, &type) &&
             type == kRfcommUuid) {
           if (AdvanceToTag(reader, kUint8Node)) {
             std::string channel_string;
             if (reader->NodeAttribute(kValueAttribute, &channel_string)) {
               std::vector<uint8> channel_bytes;
               if (base::HexStringToBytes(channel_string.substr(2),
                     &channel_bytes)) {
                 if (channel_bytes.size() == 1) {
                   rfcomm_channel_ = channel_bytes[0];
                   supports_rfcomm_ = true;
                 }
               }
             }
           }
         }
       }
     }
   } while (AdvanceToTag(reader, kSequenceNode) &&
            reader->Depth() != start_depth);
 }
 
-void BluetoothServiceRecord::ExtractUuid(XmlReader* reader) {
+void BluetoothServiceRecordDBus::ExtractUuid(XmlReader* reader) {
   const int start_depth = reader->Depth();
   do {
     if (reader->NodeName() == kSequenceNode) {
       if (AdvanceToTag(reader, kUuidNode)) {
         if (!reader->NodeAttribute(kValueAttribute, &uuid_))
           uuid_.clear();
       }
     }
   } while (AdvanceToTag(reader, kSequenceNode) &&
            reader->Depth() != start_depth);
 
   uuid_ = bluetooth_utils::CanonicalUuid(uuid_);
 }
 
 }  // namespace chromeos