Fix building on macOS with Xcode

Fixes various issues were we differ from Google's clang.

Task-number: QTBUG-60438
Change-Id: I5a97ba828f7267731e50010c4345caa19bb8939a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

29 files changed, 64 insertions, 41 deletions

diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
index 06a783310c0..23a2abc0293 100644
--- a/chromium/build/config/compiler/BUILD.gn
+++ b/chromium/build/config/compiler/BUILD.gn
@@ -306,6 +306,7 @@ config("compiler") {
   if (use_qt && is_clang) {
     cflags += [
       "-Wno-unknown-attributes",
+      "-Wno-unknown-pragmas",
       "-Wno-unknown-warning-option"
     ]
     cflags_cc += [
@@ -484,7 +485,7 @@ config("compiler") {
   # TODO(hans): Remove this once Clang generates better optimized debug info by
   # default. https://crbug.com/765793
   if (is_clang && !is_nacl && current_toolchain == host_toolchain &&
-      target_os != "chromeos") {
+      target_os != "chromeos" && !use_qt) {
     cflags += [
       "-Xclang",
       "-mllvm",
diff --git a/chromium/components/download/quarantine/quarantine_mac.mm b/chromium/components/download/quarantine/quarantine_mac.mm
index aa5d013cf92..af059203464 100644
--- a/chromium/components/download/quarantine/quarantine_mac.mm
+++ b/chromium/components/download/quarantine/quarantine_mac.mm
@@ -236,10 +236,13 @@ bool AddQuarantineMetadataToFile(const base::FilePath& file,
   base::AssertBlockingAllowed();
   base::scoped_nsobject<NSMutableDictionary> properties;
   bool success = false;
-  if (@available(macos 10.10, *)) {
+  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)
@@ -280,10 +283,15 @@ bool AddQuarantineMetadataToFile(const base::FilePath& file,
     [properties setValue:origin_url forKey:(NSString*)kLSQuarantineDataURLKey];
   }
 
-  if (@available(macos 10.10, *)) {
+  if (base::mac::IsAtLeastOS10_10()) {
     return SetQuarantineProperties(file, properties);
   } else {
+#if !defined(MAC_OS_X_VERSION_10_10) || \
+    MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_10
     return SetQuarantinePropertiesDeprecated(file, properties);
+#else
+    return false;
+#endif
   }
 }
 
@@ -314,10 +322,13 @@ bool IsFileQuarantined(const base::FilePath& file,
 
   base::scoped_nsobject<NSMutableDictionary> properties;
   bool success = false;
-  if (@available(macos 10.10, *)) {
+  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/components/viz/common/gl_helper_scaling.cc b/chromium/components/viz/common/gl_helper_scaling.cc
index 72d81dd3301..3c51c50415f 100644
--- a/chromium/components/viz/common/gl_helper_scaling.cc
+++ b/chromium/components/viz/common/gl_helper_scaling.cc
@@ -757,7 +757,7 @@ std::unique_ptr<GLHelper::ScalerInterface> GLHelperScaling::CreateScaler(
                                        std::move(ret));
   }
   ret->SetChainProperties(scale_from, scale_to, swizzle);
-  return ret;
+  return std::move(ret);
 }
 
 std::unique_ptr<GLHelper::ScalerInterface>
@@ -771,7 +771,7 @@ GLHelperScaling::CreateGrayscalePlanerizer(bool flipped_source,
   auto result = std::make_unique<ScalerImpl>(gl_, this, stage, nullptr);
   result->SetColorWeights(0, kRGBtoGrayscaleColorWeights);
   result->SetChainProperties(stage.scale_from, stage.scale_to, swizzle);
-  return result;
+  return std::move(result);
 }
 
 std::unique_ptr<GLHelper::ScalerInterface>
@@ -802,7 +802,7 @@ GLHelperScaling::CreateI420Planerizer(int plane,
       NOTREACHED();
   }
   result->SetChainProperties(stage.scale_from, stage.scale_to, swizzle);
-  return result;
+  return std::unique_ptr<GLHelper::ScalerInterface>(std::move(result));
 }
 
 std::unique_ptr<GLHelper::ScalerInterface>
@@ -821,7 +821,7 @@ GLHelperScaling::CreateI420MrtPass1Planerizer(bool flipped_source,
   result->SetColorWeights(1, kRGBtoUColorWeights);
   result->SetColorWeights(2, kRGBtoVColorWeights);
   result->SetChainProperties(stage.scale_from, stage.scale_to, swizzle);
-  return result;
+  return std::unique_ptr<GLHelper::ScalerInterface>(std::move(result));
 }
 
 std::unique_ptr<GLHelper::ScalerInterface>
@@ -835,7 +835,7 @@ GLHelperScaling::CreateI420MrtPass2Planerizer(bool swizzle) {
                              swizzle};
   auto result = std::make_unique<ScalerImpl>(gl_, this, stage, nullptr);
   result->SetChainProperties(stage.scale_from, stage.scale_to, swizzle);
-  return result;
+  return std::unique_ptr<GLHelper::ScalerInterface>(std::move(result));
 }
 
 // Triangle strip coordinates, used to sweep the entire source area when
diff --git a/chromium/content/browser/net/quota_policy_cookie_store.cc b/chromium/content/browser/net/quota_policy_cookie_store.cc
index 98068af557c..efcb604c2c6 100644
--- a/chromium/content/browser/net/quota_policy_cookie_store.cc
+++ b/chromium/content/browser/net/quota_policy_cookie_store.cc
@@ -122,6 +122,7 @@ void QuotaPolicyCookieStore::OnLoad(
 CookieStoreConfig::CookieStoreConfig()
     : restore_old_session_cookies(false),
       persist_session_cookies(false),
+      storage_policy(nullptr),
       crypto_delegate(nullptr),
       channel_id_service(nullptr) {
   // Default to an in-memory cookie store.
diff --git a/chromium/content/renderer/service_worker/worker_fetch_context_impl.cc b/chromium/content/renderer/service_worker/worker_fetch_context_impl.cc
index ed9a4c4dcd0..c0b8a1d8eab 100644
--- a/chromium/content/renderer/service_worker/worker_fetch_context_impl.cc
+++ b/chromium/content/renderer/service_worker/worker_fetch_context_impl.cc
@@ -164,7 +164,7 @@ WorkerFetchContextImpl::CreateURLLoaderFactory() {
   if (ServiceWorkerUtils::IsServicificationEnabled())
     ResetServiceWorkerURLLoaderFactory();
 
-  return factory;
+  return std::unique_ptr<blink::WebURLLoaderFactory>(factory.release());
 }
 
 std::unique_ptr<blink::WebURLLoaderFactory>
diff --git a/chromium/device/bluetooth/bluetooth_adapter_mac.mm b/chromium/device/bluetooth/bluetooth_adapter_mac.mm
index 4a025982dcd..aee47806381 100644
--- a/chromium/device/bluetooth/bluetooth_adapter_mac.mm
+++ b/chromium/device/bluetooth/bluetooth_adapter_mac.mm
@@ -92,7 +92,7 @@ base::WeakPtr<BluetoothAdapterMac> BluetoothAdapterMac::CreateAdapterForTest(
 // static
 BluetoothUUID BluetoothAdapterMac::BluetoothUUIDWithCBUUID(CBUUID* uuid) {
   // UUIDString only available OS X >= 10.10.
-  if (@available(macOS 10.10, *)) {
+  if (base::mac::IsAtLeastOS10_10()) {
     std::string uuid_c_string = base::SysNSStringToUTF8([uuid UUIDString]);
     return device::BluetoothUUID(uuid_c_string);
   } else {
diff --git a/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm b/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
index c2c2ee00d2d..9649332f6e0 100644
--- a/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
+++ b/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
@@ -406,7 +406,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);
     VLOG(1) << *gatt_descriptor_mac << ": New descriptor.";
diff --git a/chromium/device/bluetooth/bluetooth_remote_gatt_service_mac.mm b/chromium/device/bluetooth/bluetooth_remote_gatt_service_mac.mm
index 58c4ecca7b3..d4f719beb19 100644
--- a/chromium/device/bluetooth/bluetooth_remote_gatt_service_mac.mm
+++ b/chromium/device/bluetooth/bluetooth_remote_gatt_service_mac.mm
@@ -114,9 +114,11 @@ void BluetoothRemoteGattServiceMac::DidDiscoverCharacteristics() {
     }
     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)});
+    const std::string identifier = gatt_characteristic_mac->GetIdentifier();
+    std::unordered_map<std::string,
+                       std::unique_ptr<BluetoothRemoteGattCharacteristicMac>>::value_type value =
+{identifier, base::WrapUnique(gatt_characteristic_mac)};
+    auto result_iter = gatt_characteristic_macs_.insert(std::move(value));
     DCHECK(result_iter.second);
     VLOG(1) << *gatt_characteristic_mac << ": New characteristic, properties "
             << gatt_characteristic_mac->GetProperties();
diff --git a/chromium/gin/v8_initializer.cc b/chromium/gin/v8_initializer.cc
index 5547cbeada5..734ecff40a2 100644
--- a/chromium/gin/v8_initializer.cc
+++ b/chromium/gin/v8_initializer.cc
@@ -27,13 +27,12 @@
 #include "build/build_config.h"
 #include "gin/gin_features.h"
 
-#if defined(V8_USE_EXTERNAL_STARTUP_DATA)
-#if defined(OS_ANDROID)
+#if defined(V8_USE_EXTERNAL_STARTUP_DATA) && defined(OS_ANDROID)
 #include "base/android/apk_assets.h"
-#elif defined(OS_MACOSX)
+#endif  // V8_USE_EXTERNAL_STARTUP_DATA
+#if defined(OS_MACOSX)
 #include "base/mac/foundation_util.h"
 #endif
-#endif  // V8_USE_EXTERNAL_STARTUP_DATA
 
 namespace gin {
 
diff --git a/chromium/media/blink/url_index.cc b/chromium/media/blink/url_index.cc
index be61b1694e4..84c5aafa10b 100644
--- a/chromium/media/blink/url_index.cc
+++ b/chromium/media/blink/url_index.cc
@@ -32,7 +32,7 @@ std::unique_ptr<MultiBuffer::DataProvider> ResourceMultiBuffer::CreateWriter(
   auto writer = std::make_unique<ResourceMultiBufferDataProvider>(
       url_data_, pos, is_client_audio_element);
   writer->Start();
-  return writer;
+  return std::move(writer);
 }
 
 bool ResourceMultiBuffer::RangeSupported() const {
diff --git a/chromium/net/cert/x509_util_mac.cc b/chromium/net/cert/x509_util_mac.cc
index 5285c4bcd4a..b70e689b772 100644
--- a/chromium/net/cert/x509_util_mac.cc
+++ b/chromium/net/cert/x509_util_mac.cc
@@ -7,6 +7,7 @@
 #include <CommonCrypto/CommonDigest.h>
 
 #include "base/logging.h"
+#include "base/mac/mac_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "net/cert/x509_certificate.h"
 #include "third_party/apple_apsl/cssmapplePriv.h"
@@ -199,7 +200,7 @@ OSStatus CreateBasicX509Policy(SecPolicyRef* policy) {
 
 OSStatus CreateRevocationPolicies(bool enable_revocation_checking,
                                   CFMutableArrayRef policies) {
-  if (__builtin_available(macos 10.12, *)) {
+  if (base::mac::IsAtLeastOS10_12()) {
     // On Sierra, it's not possible to disable network revocation checking
     // without also breaking AIA. If revocation checking isn't explicitly
     // enabled, just don't add a revocation policy.
diff --git a/chromium/net/proxy_resolution/proxy_resolution_service.cc b/chromium/net/proxy_resolution/proxy_resolution_service.cc
index b09e8d1bc9f..e1b4a6b0dec 100644
--- a/chromium/net/proxy_resolution/proxy_resolution_service.cc
+++ b/chromium/net/proxy_resolution/proxy_resolution_service.cc
@@ -645,6 +645,7 @@ class ProxyResolutionService::PacFileDeciderPoller {
         last_error_(init_net_error),
         last_script_data_(init_script_data),
         last_poll_time_(TimeTicks::Now()),
+        default_poll_policy_(),
         weak_factory_(this) {
     // Set the initial poll delay.
     next_poll_mode_ = poll_policy()->GetNextDelay(
diff --git a/chromium/net/socket/ssl_server_socket_impl.cc b/chromium/net/socket/ssl_server_socket_impl.cc
index a8a9dc3e839..53dfbb05c5e 100644
--- a/chromium/net/socket/ssl_server_socket_impl.cc
+++ b/chromium/net/socket/ssl_server_socket_impl.cc
@@ -829,7 +829,8 @@ SSLServerContextImpl::SSLServerContextImpl(
     const SSLServerConfig& ssl_server_config)
     : ssl_server_config_(ssl_server_config),
       cert_(certificate),
-      key_(key.Copy()) {
+      key_(key.Copy()),
+      private_key_(nullptr) {
   CHECK(key_);
   Init();
 }
diff --git a/chromium/net/ssl/ssl_platform_key_mac.cc b/chromium/net/ssl/ssl_platform_key_mac.cc
index 7299a8312b9..ff79b3fecfc 100644
--- a/chromium/net/ssl/ssl_platform_key_mac.cc
+++ b/chromium/net/ssl/ssl_platform_key_mac.cc
@@ -211,7 +211,7 @@ SecKeyAlgorithm GetSecKeyAlgorithm(uint16_t algorithm) {
       return kSecKeyAlgorithmECDSASignatureDigestX962SHA1;
   }
 
-  if (__builtin_available(macOS 10.13, *)) {
+  if (base::mac::IsAtLeastOS10_13()) {
     switch (algorithm) {
       case SSL_SIGN_RSA_PSS_SHA512:
         return kSecKeyAlgorithmRSASignatureDigestPSSSHA512;
@@ -298,7 +298,7 @@ scoped_refptr<SSLPrivateKey> CreateSSLPrivateKeyForSecKey(
   if (!GetClientCertInfo(certificate, &key_type, &max_length))
     return nullptr;
 
-  if (__builtin_available(macOS 10.12, *)) {
+  if (base::mac::IsAtLeastOS10_12()) {
     return base::MakeRefCounted<ThreadedSSLPrivateKey>(
         std::make_unique<SSLPlatformKeySecKey>(key_type, max_length,
                                                private_key),
diff --git a/chromium/services/network/network_service.cc b/chromium/services/network/network_service.cc
index bd8a5612747..e7d2445f8ec 100644
--- a/chromium/services/network/network_service.cc
+++ b/chromium/services/network/network_service.cc
@@ -209,7 +209,7 @@ NetworkService::CreateNetworkContextWithBuilder(
       std::make_unique<NetworkContext>(this, std::move(request),
                                        std::move(params), std::move(builder));
   *url_request_context = network_context->GetURLRequestContext();
-  return network_context;
+  return std::move(network_context);
 }
 
 std::unique_ptr<NetworkService> NetworkService::CreateForTesting() {
diff --git a/chromium/services/resource_coordinator/resource_coordinator_service.cc b/chromium/services/resource_coordinator/resource_coordinator_service.cc
index 52a88f8b140..72019756a4a 100644
--- a/chromium/services/resource_coordinator/resource_coordinator_service.cc
+++ b/chromium/services/resource_coordinator/resource_coordinator_service.cc
@@ -17,7 +17,7 @@
 namespace resource_coordinator {
 
 std::unique_ptr<service_manager::Service> ResourceCoordinatorService::Create() {
-  auto resource_coordinator_service =
+  std::unique_ptr<service_manager::Service> resource_coordinator_service =
       std::make_unique<ResourceCoordinatorService>();
 
   return resource_coordinator_service;
diff --git a/chromium/services/shape_detection/barcode_detection_impl_mac.mm b/chromium/services/shape_detection/barcode_detection_impl_mac.mm
index 99c8287a97c..3c01279d3f2 100644
--- a/chromium/services/shape_detection/barcode_detection_impl_mac.mm
+++ b/chromium/services/shape_detection/barcode_detection_impl_mac.mm
@@ -18,7 +18,7 @@ namespace shape_detection {
 void BarcodeDetectionImpl::Create(
     shape_detection::mojom::BarcodeDetectionRequest request) {
   // Barcode detection needs at least MAC OS X 10.10.
-  if (@available(macOS 10.10, *)) {
+  if (base::mac::IsAtLeastOS10_10()) {
     mojo::MakeStrongBinding(std::make_unique<BarcodeDetectionImplMac>(),
                             std::move(request));
   }
diff --git a/chromium/services/shape_detection/text_detection_impl_mac.mm b/chromium/services/shape_detection/text_detection_impl_mac.mm
index 23cdc0e8c40..d9b8684c213 100644
--- a/chromium/services/shape_detection/text_detection_impl_mac.mm
+++ b/chromium/services/shape_detection/text_detection_impl_mac.mm
@@ -17,7 +17,7 @@ namespace shape_detection {
 // static
 void TextDetectionImpl::Create(mojom::TextDetectionRequest request) {
   // Text detection needs at least MAC OS X 10.11.
-  if (@available(macOS 10.11, *)) {
+  if (base::mac::IsAtLeastOS10_11()) {
     mojo::MakeStrongBinding(std::make_unique<TextDetectionImplMac>(),
                             std::move(request));
   }
diff --git a/chromium/third_party/blink/renderer/bindings/core/v8/referrer_script_info.h b/chromium/third_party/blink/renderer/bindings/core/v8/referrer_script_info.h
index 69482f55939..4decbc39264 100644
--- a/chromium/third_party/blink/renderer/bindings/core/v8/referrer_script_info.h
+++ b/chromium/third_party/blink/renderer/bindings/core/v8/referrer_script_info.h
@@ -22,7 +22,7 @@ namespace blink {
 // https://html.spec.whatwg.org/multipage/webappapis.html#hostimportmoduledynamically(referencingscriptormodule,-specifier,-promisecapability)
 class CORE_EXPORT ReferrerScriptInfo {
  public:
-  ReferrerScriptInfo() {}
+  ReferrerScriptInfo() : nonce_() {}
   ReferrerScriptInfo(const KURL& base_url,
                      network::mojom::FetchCredentialsMode credentials_mode,
                      const String& nonce,
diff --git a/chromium/third_party/blink/renderer/core/html/forms/file_chooser.h b/chromium/third_party/blink/renderer/core/html/forms/file_chooser.h
index b0d4ce85213..644c08a0c17 100644
--- a/chromium/third_party/blink/renderer/core/html/forms/file_chooser.h
+++ b/chromium/third_party/blink/renderer/core/html/forms/file_chooser.h
@@ -49,7 +49,7 @@ struct FileChooserFileInfo {
       : path(path), display_name(display_name) {}
 
   FileChooserFileInfo(const KURL& file_system_url, const FileMetadata metadata)
-      : file_system_url(file_system_url), metadata(metadata) {}
+      : path(), display_name(), file_system_url(file_system_url), metadata(metadata) {}
 
   // Members for native files.
   const String path;
diff --git a/chromium/third_party/blink/renderer/core/html/forms/form_data.h b/chromium/third_party/blink/renderer/core/html/forms/form_data.h
index 9e0ed37b2d2..219dae563c0 100644
--- a/chromium/third_party/blink/renderer/core/html/forms/form_data.h
+++ b/chromium/third_party/blink/renderer/core/html/forms/form_data.h
@@ -114,9 +114,9 @@ class CORE_EXPORT FormData final
 class FormData::Entry : public GarbageCollectedFinalized<FormData::Entry> {
  public:
   Entry(const CString& name, const CString& value)
-      : name_(name), value_(value) {}
+      : name_(name), value_(value), filename_() {}
   Entry(const CString& name, Blob* blob, const String& filename)
-      : name_(name), blob_(blob), filename_(filename) {}
+      : name_(name), value_(), blob_(blob), filename_(filename) {}
   void Trace(blink::Visitor*);
 
   bool IsString() const { return !blob_; }
diff --git a/chromium/third_party/blink/renderer/core/inspector/inspector_highlight.cc b/chromium/third_party/blink/renderer/core/inspector/inspector_highlight.cc
index 4d319c9667b..05e9a98771a 100644
--- a/chromium/third_party/blink/renderer/core/inspector/inspector_highlight.cc
+++ b/chromium/third_party/blink/renderer/core/inspector/inspector_highlight.cc
@@ -259,7 +259,7 @@ std::unique_ptr<protocol::Value> BuildGapAndPositions(
   }
   result->setValue("positions", std::move(spans));
 
-  return result;
+  return std::move(result);
 }
 
 std::unique_ptr<protocol::DictionaryValue> BuildGridInfo(
diff --git a/chromium/third_party/blink/renderer/modules/indexeddb/idb_key.h b/chromium/third_party/blink/renderer/modules/indexeddb/idb_key.h
index 3082acad539..678155199be 100644
--- a/chromium/third_party/blink/renderer/modules/indexeddb/idb_key.h
+++ b/chromium/third_party/blink/renderer/modules/indexeddb/idb_key.h
@@ -140,8 +140,8 @@ class MODULES_EXPORT IDBKey {
  private:
   DISALLOW_COPY_AND_ASSIGN(IDBKey);
 
-  IDBKey() : type_(kInvalidType) {}
-  IDBKey(Type type, double number) : type_(type), number_(number) {}
+  IDBKey() : type_(kInvalidType), string_() {}
+  IDBKey(Type type, double number) : type_(type), string_(), number_(number) {}
   explicit IDBKey(const class String& value)
       : type_(kStringType), string_(value) {}
   explicit IDBKey(scoped_refptr<SharedBuffer> value)
diff --git a/chromium/third_party/blink/renderer/modules/indexeddb/idb_transaction.cc b/chromium/third_party/blink/renderer/modules/indexeddb/idb_transaction.cc
index 2b882c0aed7..1543a2e3b5b 100644
--- a/chromium/third_party/blink/renderer/modules/indexeddb/idb_transaction.cc
+++ b/chromium/third_party/blink/renderer/modules/indexeddb/idb_transaction.cc
@@ -133,7 +133,8 @@ IDBTransaction::IDBTransaction(ExecutionContext* execution_context,
       open_db_request_(open_db_request),
       mode_(kWebIDBTransactionModeVersionChange),
       state_(kInactive),
-      old_database_metadata_(old_metadata) {
+      old_database_metadata_(old_metadata),
+      scope_() {
   DCHECK(database_);
   DCHECK(open_db_request_);
   DCHECK(scope_.IsEmpty());
diff --git a/chromium/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc b/chromium/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc
index f3e4416d756..dbc5862ae72 100644
--- a/chromium/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc
+++ b/chromium/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc
@@ -851,7 +851,7 @@ std::vector<SkISize> JPEGImageDecoder::GetSupportedDecodeSizes() const {
 // If you need a specific implementation for other J_COLOR_SPACE values,
 // please add a full template specialization for this function below.
 template <J_COLOR_SPACE colorSpace>
-void SetPixel(ImageFrame::PixelData*, JSAMPARRAY samples, int column) = delete;
+void SetPixel(ImageFrame::PixelData*, JSAMPARRAY samples, int column);
 
 // Used only for debugging with libjpeg (instead of libjpeg-turbo).
 template <>
diff --git a/chromium/third_party/blink/renderer/platform/loader/fetch/script_fetch_options.h b/chromium/third_party/blink/renderer/platform/loader/fetch/script_fetch_options.h
index 57883285a4a..ec7621eb086 100644
--- a/chromium/third_party/blink/renderer/platform/loader/fetch/script_fetch_options.h
+++ b/chromium/third_party/blink/renderer/platform/loader/fetch/script_fetch_options.h
@@ -28,7 +28,10 @@ class PLATFORM_EXPORT ScriptFetchOptions final {
   // string, parser metadata is "not-parser-inserted", and credentials mode
   // is "omit"." [spec text]
   ScriptFetchOptions()
-      : parser_state_(ParserDisposition::kNotParserInserted),
+      : nonce_(),
+        integrity_metadata_(),
+        integrity_attribute_(),
+        parser_state_(ParserDisposition::kNotParserInserted),
         credentials_mode_(network::mojom::FetchCredentialsMode::kOmit) {}
 
   ScriptFetchOptions(const String& nonce,
diff --git a/chromium/third_party/blink/renderer/platform/wtf/text/wtf_string.h b/chromium/third_party/blink/renderer/platform/wtf/text/wtf_string.h
index 361322374f6..dc7153ed13c 100644
--- a/chromium/third_party/blink/renderer/platform/wtf/text/wtf_string.h
+++ b/chromium/third_party/blink/renderer/platform/wtf/text/wtf_string.h
@@ -64,7 +64,7 @@ class WTF_EXPORT String {
 
  public:
   // Construct a null string, distinguishable from an empty string.
-  String() = default;
+  String() {}
 
   // Construct a string with UTF-16 data.
   String(const UChar* characters, unsigned length);
diff --git a/chromium/ui/accelerated_widget_mac/ca_renderer_layer_tree.mm b/chromium/ui/accelerated_widget_mac/ca_renderer_layer_tree.mm
index bedf8756b02..d8ea327f07b 100644
--- a/chromium/ui/accelerated_widget_mac/ca_renderer_layer_tree.mm
+++ b/chromium/ui/accelerated_widget_mac/ca_renderer_layer_tree.mm
@@ -12,6 +12,7 @@
 #include <utility>
 
 #include "base/command_line.h"
+#include "base/mac/mac_util.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/trace_event/trace_event.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ -81,7 +82,7 @@ bool AVSampleBufferDisplayLayerEnqueueCVPixelBuffer(
 
   [av_layer enqueueSampleBuffer:sample_buffer];
 
-  if (@available(macOS 10.10, *)) {
+  if (base::mac::IsAtLeastOS10_10()) {
     AVQueuedSampleBufferRenderingStatus status = [av_layer status];
     switch (status) {
       case AVQueuedSampleBufferRenderingStatusUnknown:
diff --git a/chromium/ui/base/cocoa/nsview_additions.mm b/chromium/ui/base/cocoa/nsview_additions.mm
index 4f37d9e3989..66152b88c12 100644
--- a/chromium/ui/base/cocoa/nsview_additions.mm
+++ b/chromium/ui/base/cocoa/nsview_additions.mm
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/mac/mac_util.h"
 #include "base/mac/sdk_forward_declarations.h"
 #import "ui/base/cocoa/nsview_additions.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
@@ -115,7 +116,7 @@ static NSView* g_childBeingDrawnTo = nil;
 }
 
 - (void)cr_setAccessibilityLabel:(NSString*)label {
-  if (@available(macOS 10.10, *)) {
+  if (base::mac::IsAtLeastOS10_10()) {
     self.accessibilityLabel = label;
   } else {
     [self accessibilitySetOverrideValue:label