Fix building on macOS

Fix a few issues triggered while trying to build on mac after the
rebase on Chromium 58

Change-Id: I998d104862d807caa6b176c62bebc9e57461968b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

2 files changed, 4 insertions, 1 deletions

diff --git a/chromium/content/common/quarantine/quarantine_mac.mm b/chromium/content/common/quarantine/quarantine_mac.mm
index 3a5880d21b6..b7e23d0d430 100644
--- a/chromium/content/common/quarantine/quarantine_mac.mm
+++ b/chromium/content/common/quarantine/quarantine_mac.mm
@@ -330,7 +330,10 @@ bool IsFileQuarantined(const base::FilePath& file,
   if (base::mac::IsAtLeastOS10_10()) {
     success = GetQuarantineProperties(file, &properties);
   } else {
+#if !defined(MAC_OS_X_VERSION_10_10) || \
+    MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_10
     success = GetQuarantinePropertiesDeprecated(file, &properties);
+#endif
   }
 
   if (!success || !properties)
diff --git a/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm b/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
index ae72118130f..d57688f9465 100644
--- a/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
+++ b/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
@@ -347,7 +347,7 @@ void BluetoothRemoteGattCharacteristicMac::DidDiscoverDescriptors() {
         new BluetoothRemoteGattDescriptorMac(this, cb_descriptor);
     const std::string& identifier = gatt_descriptor_mac->GetIdentifier();
     auto result_iter = gatt_descriptor_macs_.insert(
-        {identifier, base::WrapUnique(gatt_descriptor_mac)});
+        std::make_pair(identifier, base::WrapUnique(gatt_descriptor_mac)));
     DCHECK(result_iter.second);
     GetMacAdapter()->NotifyGattDescriptorAdded(gatt_descriptor_mac);
   }