Build fixes after Chromium 67 merge

Change-Id: I488c70fc54dfed95d3b346735e63f5aa0c6f1a88
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

7 files changed, 11 insertions, 5 deletions

diff --git a/chromium/base/logging.h b/chromium/base/logging.h
index e7bf2e1920f..1f2a4487582 100644
--- a/chromium/base/logging.h
+++ b/chromium/base/logging.h
@@ -1054,7 +1054,7 @@ class LogMessageVoidify {
   LogMessageVoidify() = default;
   // This has to be an operator with a precedence lower than << but
   // higher than ?:
-  void operator&(std::ostream&) { }
+  constexpr void operator&(std::ostream&) { }
 };
 
 #if defined(OS_WIN)
diff --git a/chromium/base/optional.h b/chromium/base/optional.h
index c1d11ca7a18..65a30a7f841 100644
--- a/chromium/base/optional.h
+++ b/chromium/base/optional.h
@@ -148,7 +148,7 @@ struct OptionalStorage : OptionalStorageBase<T> {
   // Define it explicitly.
   OptionalStorage() = default;
 
-  OptionalStorage(const OptionalStorage& other) {
+  OptionalStorage(const OptionalStorage& other) : OptionalStorageBase<T>() {
     if (other.is_populated_)
       Init(other.value_);
   }
diff --git a/chromium/components/viz/service/display_embedder/gpu_display_provider.cc b/chromium/components/viz/service/display_embedder/gpu_display_provider.cc
index 45b178149bf..120e134a74e 100644
--- a/chromium/components/viz/service/display_embedder/gpu_display_provider.cc
+++ b/chromium/components/viz/service/display_embedder/gpu_display_provider.cc
@@ -51,6 +51,10 @@
 #include "ui/ozone/public/surface_ozone_canvas.h"
 #endif
 
+#ifndef GL_BGRA_EXT
+#define GL_BGRA_EXT             0x80E1
+#endif
+
 namespace {
 
 gpu::ImageFactory* GetImageFactory(gpu::GpuChannelManager* channel_manager) {
diff --git a/chromium/content/public/browser/navigation_controller.h b/chromium/content/public/browser/navigation_controller.h
index 3bd12f4efc2..f23a7a43b43 100644
--- a/chromium/content/public/browser/navigation_controller.h
+++ b/chromium/content/public/browser/navigation_controller.h
@@ -211,6 +211,8 @@ class NavigationController {
 
     explicit LoadURLParams(const GURL& url);
     ~LoadURLParams();
+    LoadURLParams(LoadURLParams &&) = default;
+    LoadURLParams& operator=(LoadURLParams &&) = default;
 
     DISALLOW_COPY_AND_ASSIGN(LoadURLParams);
   };
diff --git a/chromium/device/fido/fido_constants.h b/chromium/device/fido/fido_constants.h
index 3ec3d1dd52b..27af964b236 100644
--- a/chromium/device/fido/fido_constants.h
+++ b/chromium/device/fido/fido_constants.h
@@ -295,7 +295,7 @@ constexpr const char* to_string(CredentialType type) {
     case CredentialType::kPublicKey:
       return kPublicKey;
   }
-  NOTREACHED();
+//  NOTREACHED();
   return kPublicKey;
 }
 
diff --git a/chromium/third_party/widevine/cdm/BUILD.gn b/chromium/third_party/widevine/cdm/BUILD.gn
index 55b471ea93f..70a84a95df0 100644
--- a/chromium/third_party/widevine/cdm/BUILD.gn
+++ b/chromium/third_party/widevine/cdm/BUILD.gn
@@ -11,7 +11,7 @@ import("//third_party/widevine/cdm/widevine.gni")
 # Internal Cast builds set enable_widevine=true to bring in Widevine support.
 # TODO(xhwang): Support component updated CDM on other platforms and remove this
 # assert.
-assert(!enable_widevine || is_win || is_mac || is_chromecast,
+assert(!enable_widevine || is_win || is_mac || is_chromecast || use_qt,
        "Component updated CDM only supported on Windows and Mac for now.")
 
 widevine_arch = current_cpu
diff --git a/chromium/ui/display/display_switches.cc b/chromium/ui/display/display_switches.cc
index 880fba64afe..f6f5e469566 100644
--- a/chromium/ui/display/display_switches.cc
+++ b/chromium/ui/display/display_switches.cc
@@ -75,7 +75,7 @@ const base::Feature kUseMonitorColorSpace{"UseMonitorColorSpace",
 // Enables the slider in display settings to modify the display zoom/size.
 // TODO(malaykeshav): Remove this in M68 when the feature has been in stable for
 // atleast one milestone.
-constexpr base::Feature kEnableDisplayZoomSetting{
+const base::Feature kEnableDisplayZoomSetting{
   "EnableDisplayZoomSetting",
 #if defined(OS_CHROMEOS)
       base::FEATURE_ENABLED_BY_DEFAULT