Implement BluetoothDeviceBlueZ::GetServiceRecords.

device/bluetooth/bluez/bluetooth_service_record_bluez.cc

 // Copyright 2016 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/bluez/bluetooth_service_record_bluez.h"
 
+#include <utility>
+
 #include "base/values.h"
 
 namespace bluez {
 
-BluetoothServiceRecordBlueZ::BluetoothServiceRecordBlueZ(
-    const std::map<uint16_t, BluetoothServiceAttributeValueBlueZ>& attributes)
-    : attributes_(attributes) {}
+BluetoothServiceRecordBlueZ::BluetoothServiceRecordBlueZ() {}
 
 BluetoothServiceRecordBlueZ::BluetoothServiceRecordBlueZ(
     const BluetoothServiceRecordBlueZ& record) {
   this->attributes_ = record.attributes_;
 }
 
 BluetoothServiceRecordBlueZ::~BluetoothServiceRecordBlueZ() {}
 
 const std::vector<uint16_t> BluetoothServiceRecordBlueZ::GetAttributeIds()
     const {
   std::vector<uint16_t> ids;
   ids.reserve(attributes_.size());
   for (const auto& attribute : attributes_)
     ids.emplace_back(attribute.first);
   return ids;
 }
 
 const BluetoothServiceAttributeValueBlueZ&
 BluetoothServiceRecordBlueZ::GetAttributeValue(uint16_t attribute_id) const {
   auto it = attributes_.find(attribute_id);
   CHECK(it != attributes_.end());
   return it->second;
 }
 
+void BluetoothServiceRecordBlueZ::AddRecordEntry(
+    uint16_t id,
+    const BluetoothServiceAttributeValueBlueZ& value) {
+  auto it = attributes_.find(id);
+  if (it != attributes_.end())
+    attributes_.erase(it);

[xiyuan, 2016/06/29 22:43:08]

Why do we need to explicitly remove the existing one? Why not just

  attributes_[id] = value;

[rkc, 2016/06/30 20:02:24]

This is a painful part of std::map. This apparently always first creates a
BluetoothServiceAttributeValueBlueZ() first, and then tries to copy over it.
Since we don't have (nor want) a constructor for
BluetoothServiceAttributeValueBlueZ(), the only way around this is to use
insert.

Using insert has the side-effect of requiring us to explicitly erase first.

[xiyuan, 2016/06/30 20:07:34]

Acknowledged.

+  attributes_.insert(

[xiyuan, 2016/06/30 20:07:34]

nit: could this be

  attributes_.emplace(id, value);

?

[rkc, 2016/06/30 20:15:54]

For some reason, map::emplace breaks some bots, while vector::emplace_back
doesn't.
https://luci-logdog.appspot.com/v/?s=chromium%2Fbb%2Ftryserver.chromium.linux...

+      std::pair<uint16_t, BluetoothServiceAttributeValueBlueZ>(id, value));
+}
+
 }  // namespace bluez