[counting_allocator] Chrome changes.

device/bluetooth/bluetooth_remote_gatt_service_mac.mm

 // 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/bluetooth_remote_gatt_service_mac.h"
 
 #import <CoreBluetooth/CoreBluetooth.h>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 84 matching lines @@
     if (gatt_characteristic_mac) {
       const std::string& identifier = gatt_characteristic_mac->GetIdentifier();
       characteristic_identifier_to_remove.erase(identifier);
       gatt_characteristic_mac->DiscoverDescriptors();
       continue;
     }
     gatt_characteristic_mac =
         new BluetoothRemoteGattCharacteristicMac(this, cb_characteristic);
     const std::string& identifier = gatt_characteristic_mac->GetIdentifier();
     auto result_iter = gatt_characteristic_macs_.insert(
-        {identifier, base::WrapUnique(gatt_characteristic_mac)});
+        std::make_pair(identifier, base::WrapUnique(gatt_characteristic_mac)));
     DCHECK(result_iter.second);
     gatt_characteristic_mac->DiscoverDescriptors();
     GetMacAdapter()->NotifyGattCharacteristicAdded(gatt_characteristic_mac);
   }
 
   for (const std::string& identifier : characteristic_identifier_to_remove) {
     auto pair_to_remove = gatt_characteristic_macs_.find(identifier);
     std::unique_ptr<BluetoothRemoteGattCharacteristicMac>
         characteristic_to_remove;
     pair_to_remove->second.swap(characteristic_to_remove);
@@ skipping 85 matching lines @@
         return pair.second->GetCBCharacteristic() == characteristic;
       });
   if (found == gatt_characteristic_macs_.end()) {
     return nullptr;
   } else {
     return found->second.get();
   }
 }
 
 }  // namespace device