Fix mac build after Chromium 61-63 merges

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

9 files changed, 16 insertions, 15 deletions

diff --git a/chromium/components/viz/common/gl_helper_scaling.cc b/chromium/components/viz/common/gl_helper_scaling.cc
index c40cca03ac9..3a766be0c77 100644
--- a/chromium/components/viz/common/gl_helper_scaling.cc
+++ b/chromium/components/viz/common/gl_helper_scaling.cc
@@ -587,7 +587,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>
@@ -599,7 +599,7 @@ GLHelperScaling::CreateGrayscalePlanerizer(bool vertically_flip_texture,
   auto result = base::MakeUnique<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>
@@ -628,7 +628,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>
@@ -642,7 +642,7 @@ GLHelperScaling::CreateI420MrtPass1Planerizer(bool vertically_flip_texture,
   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>
@@ -653,7 +653,7 @@ GLHelperScaling::CreateI420MrtPass2Planerizer(bool vertically_flip_texture,
                              vertically_flip_texture, swizzle};
   auto result = base::MakeUnique<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/network/network_service_impl.cc b/chromium/content/network/network_service_impl.cc
index 8dba0631306..fd249586028 100644
--- a/chromium/content/network/network_service_impl.cc
+++ b/chromium/content/network/network_service_impl.cc
@@ -90,7 +90,7 @@ NetworkServiceImpl::CreateNetworkContextWithBuilder(
       base::MakeUnique<NetworkContext>(this, std::move(request),
                                        std::move(params), std::move(builder));
   *url_request_context = network_context->url_request_context();
-  return network_context;
+  return std::move(network_context);
 }
 
 std::unique_ptr<NetworkServiceImpl> NetworkServiceImpl::CreateForTesting() {
diff --git a/chromium/gin/v8_initializer.cc b/chromium/gin/v8_initializer.cc
index ac2cf9de42d..fd5e261a030 100644
--- a/chromium/gin/v8_initializer.cc
+++ b/chromium/gin/v8_initializer.cc
@@ -26,13 +26,12 @@
 #include "base/time/time.h"
 #include "build/build_config.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 4264b959c6a..de8f8c78dbb 100644
--- a/chromium/media/blink/url_index.cc
+++ b/chromium/media/blink/url_index.cc
@@ -31,7 +31,7 @@ std::unique_ptr<MultiBuffer::DataProvider> ResourceMultiBuffer::CreateWriter(
   auto writer =
       base::MakeUnique<ResourceMultiBufferDataProvider>(url_data_, pos);
   writer->Start();
-  return writer;
+  return std::move(writer);
 }
 
 bool ResourceMultiBuffer::RangeSupported() const {
diff --git a/chromium/net/base/hash_value.h b/chromium/net/base/hash_value.h
index 52732ebd5d7..c076114edce 100644
--- a/chromium/net/base/hash_value.h
+++ b/chromium/net/base/hash_value.h
@@ -84,6 +84,7 @@ typedef std::vector<HashValue> HashValueVector;
 
 class SHA256HashValueLessThan {
  public:
+  SHA256HashValueLessThan() { }
   bool operator()(const SHA256HashValue& lhs,
                   const SHA256HashValue& rhs) const {
     return memcmp(lhs.data, rhs.data, sizeof(lhs.data)) < 0;
diff --git a/chromium/services/resource_coordinator/resource_coordinator_service.cc b/chromium/services/resource_coordinator/resource_coordinator_service.cc
index 855e1310ab7..f61e26bcfa8 100644
--- a/chromium/services/resource_coordinator/resource_coordinator_service.cc
+++ b/chromium/services/resource_coordinator/resource_coordinator_service.cc
@@ -20,7 +20,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 =
       base::MakeUnique<ResourceCoordinatorService>();
 
   return resource_coordinator_service;
diff --git a/chromium/third_party/WebKit/Source/core/inspector/InspectorHighlight.cpp b/chromium/third_party/WebKit/Source/core/inspector/InspectorHighlight.cpp
index a8534d380f1..5b3cb5e91a6 100644
--- a/chromium/third_party/WebKit/Source/core/inspector/InspectorHighlight.cpp
+++ b/chromium/third_party/WebKit/Source/core/inspector/InspectorHighlight.cpp
@@ -245,7 +245,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/WebKit/Source/core/loader/resource/ImageResourceContent.cpp b/chromium/third_party/WebKit/Source/core/loader/resource/ImageResourceContent.cpp
index 69e7c67d4d1..3986121ba85 100644
--- a/chromium/third_party/WebKit/Source/core/loader/resource/ImageResourceContent.cpp
+++ b/chromium/third_party/WebKit/Source/core/loader/resource/ImageResourceContent.cpp
@@ -28,7 +28,7 @@ class NullImageResourceInfo final
   USING_GARBAGE_COLLECTED_MIXIN(NullImageResourceInfo);
 
  public:
-  NullImageResourceInfo() {}
+  NullImageResourceInfo() : error_() {}
 
   DEFINE_INLINE_VIRTUAL_TRACE() { ImageResourceInfo::Trace(visitor); }
 
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