FIXUP: Fix building on macOS with Xcode

Change-Id: I38a73bfd4dfaa930253f6d82eff940b4e03820c2
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

5 files changed, 10 insertions, 6 deletions

diff --git a/chromium/base/mac/sdk_forward_declarations.h b/chromium/base/mac/sdk_forward_declarations.h
index 49ca9c9a25d..b78de96f41a 100644
--- a/chromium/base/mac/sdk_forward_declarations.h
+++ b/chromium/base/mac/sdk_forward_declarations.h
@@ -286,6 +286,10 @@ typedef void (^VNRequestCompletionHandler)(VNRequest* request, NSError* error);
     : VNImageBasedRequest<VNFaceObservationAccepting>
 @end
 
+#ifndef NS_STRING_ENUM
+#define NS_STRING_ENUM
+#endif
+
 // VNImageRequestHandler forward declarations.
 typedef NSString* VNImageOption NS_STRING_ENUM;
 
diff --git a/chromium/net/cookies/cookie_monster_change_dispatcher.cc b/chromium/net/cookies/cookie_monster_change_dispatcher.cc
index 2eadab6ca65..4e88ede2395 100644
--- a/chromium/net/cookies/cookie_monster_change_dispatcher.cc
+++ b/chromium/net/cookies/cookie_monster_change_dispatcher.cc
@@ -121,7 +121,7 @@ CookieMonsterChangeDispatcher::AddCallbackForCookie(
       std::move(callback));
 
   LinkSubscription(subscription.get());
-  return subscription;
+  return std::move(subscription);
 }
 
 std::unique_ptr<CookieChangeSubscription>
@@ -135,7 +135,7 @@ CookieMonsterChangeDispatcher::AddCallbackForUrl(
       std::string(kGlobalNameKey), url, std::move(callback));
 
   LinkSubscription(subscription.get());
-  return subscription;
+  return std::move(subscription);
 }
 
 std::unique_ptr<CookieChangeSubscription>
@@ -148,7 +148,7 @@ CookieMonsterChangeDispatcher::AddCallbackForAllChanges(
       std::string(kGlobalNameKey), GURL(""), std::move(callback));
 
   LinkSubscription(subscription.get());
-  return subscription;
+  return std::move(subscription);
 }
 
 void CookieMonsterChangeDispatcher::DispatchChange(
diff --git a/chromium/third_party/webrtc/modules/audio_processing/aec3/coherence_gain.cc b/chromium/third_party/webrtc/modules/audio_processing/aec3/coherence_gain.cc
index ad33382b3ae..dac35afb095 100644
--- a/chromium/third_party/webrtc/modules/audio_processing/aec3/coherence_gain.cc
+++ b/chromium/third_party/webrtc/modules/audio_processing/aec3/coherence_gain.cc
@@ -58,7 +58,7 @@ int CmpFloat(const void* a, const void* b) {
 
 CoherenceGain::CoherenceGain(int sample_rate_hz, size_t num_bands_to_compute)
     : num_bands_to_compute_(num_bands_to_compute),
-      sample_rate_scaler_(sample_rate_hz >= 16000 ? 2 : 1) {
+      sample_rate_scaler_(sample_rate_hz >= 16000 ? 2 : 1), fft_() {
   spectra_.Cye.Clear();
   spectra_.Cxy.Clear();
   spectra_.Pe.fill(0.f);
diff --git a/chromium/ui/gfx/mac/io_surface.cc b/chromium/ui/gfx/mac/io_surface.cc
index bf6111f0387..9ef28dd070b 100644
--- a/chromium/ui/gfx/mac/io_surface.cc
+++ b/chromium/ui/gfx/mac/io_surface.cc
@@ -223,7 +223,7 @@ void IOSurfaceSetColorSpace(IOSurfaceRef io_surface,
         ICCProfile::FromParametricColorSpace(color_space.GetAsFullRangeRGB());
   }
   if (!icc_profile.IsValid()) {
-    if (__builtin_available(macos 10.12, *)) {
+    if (base::mac::IsAtLeastOS10_12()) {
       static const ColorSpace kBt2020(ColorSpace::PrimaryID::BT2020,
                                       ColorSpace::TransferID::SMPTEST2084,
                                       ColorSpace::MatrixID::BT2020_NCL,
diff --git a/chromium/v8/src/inspector/wasm-translation.cc b/chromium/v8/src/inspector/wasm-translation.cc
index 4754af5442c..be46e3fccbb 100644
--- a/chromium/v8/src/inspector/wasm-translation.cc
+++ b/chromium/v8/src/inspector/wasm-translation.cc
@@ -49,7 +49,7 @@ struct WasmSourceInformation {
     std::sort(reverse_offset_table.begin(), reverse_offset_table.end(), cmp);
   }
 
-  WasmSourceInformation() = default;
+  WasmSourceInformation() {}
 };
 
 class WasmTranslation::TranslatorImpl {