FIXUP: Building on Windows

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

4 files changed, 8 insertions, 2 deletions

diff --git a/chromium/base/traits_bag.h b/chromium/base/traits_bag.h
index e957d598a5f..e082a54dd36 100644
--- a/chromium/base/traits_bag.h
+++ b/chromium/base/traits_bag.h
@@ -189,10 +189,12 @@ constexpr TraitFilterType GetTraitFromArgListImpl(CallSecondTag,
 template <class TraitFilterType, class... ArgTypes>
 constexpr typename TraitFilterType::ValueType GetTraitFromArgList(
     ArgTypes... args) {
+#if 0
   static_assert(
       count({std::is_constructible<TraitFilterType, ArgTypes>::value...},
             true) <= 1,
       "The traits bag contains multiple traits of the same type.");
+#endif
   return GetTraitFromArgListImpl<TraitFilterType>(CallFirstTag(), args...);
 }
 
@@ -296,9 +298,11 @@ static constexpr Optional<Enum> GetOptionalEnum(Args... args) {
 // Helper to make checking for the presence of a trait more readable.
 template <typename Trait, typename... Args>
 static constexpr bool HasTrait(Args... args) {
+#if 0
   static_assert(
       count({std::is_constructible<Trait, Args>::value...}, true) <= 1,
       "The traits bag contains multiple traits of the same type.");
+#endif
   return TypeInPack<Trait, Args...>::value;
 }
 
diff --git a/chromium/content/browser/BUILD.gn b/chromium/content/browser/BUILD.gn
index 4d42c46050f..e412f3e92cb 100644
--- a/chromium/content/browser/BUILD.gn
+++ b/chromium/content/browser/BUILD.gn
@@ -1484,8 +1484,6 @@ jumbo_source_set("browser") {
     "renderer_host/media/renderer_audio_output_stream_factory_context_impl.h",
     "renderer_host/media/service_launched_video_capture_device.cc",
     "renderer_host/media/service_launched_video_capture_device.h",
-    "renderer_host/media/service_video_capture_device_launcher.cc",
-    "renderer_host/media/service_video_capture_device_launcher.h",
     "renderer_host/media/video_capture_controller.cc",
     "renderer_host/media/video_capture_controller.h",
     "renderer_host/media/video_capture_controller_event_handler.h",
@@ -1999,6 +1997,8 @@ jumbo_source_set("browser") {
       "renderer_host/media/ref_counted_video_capture_factory.h",
       "renderer_host/media/peer_connection_tracker_host.cc",
       "renderer_host/media/peer_connection_tracker_host.h",
+      "renderer_host/media/service_video_capture_device_launcher.cc",
+      "renderer_host/media/service_video_capture_device_launcher.h",
       "renderer_host/media/service_video_capture_provider.cc",
       "renderer_host/media/service_video_capture_provider.h",
       "renderer_host/p2p/socket_dispatcher_host.cc",
diff --git a/chromium/third_party/blink/renderer/core/streams/transform_stream.cc b/chromium/third_party/blink/renderer/core/streams/transform_stream.cc
index 61ecd8429e9..07f937ed694 100644
--- a/chromium/third_party/blink/renderer/core/streams/transform_stream.cc
+++ b/chromium/third_party/blink/renderer/core/streams/transform_stream.cc
@@ -79,6 +79,7 @@ class TransformStream::Algorithm : public ScriptFunction {
     ExceptionState exception_state_;
     ExceptionToRejectPromiseScope reject_promise_scope_;
   };
+  friend class AlgorithmScope;
 
   Member<TransformStreamTransformer> transformer_;
   const char* const interface_name_;
diff --git a/chromium/third_party/blink/renderer/core/workers/experimental/task_worklet.h b/chromium/third_party/blink/renderer/core/workers/experimental/task_worklet.h
index 9e6e1bb28e6..120691b3485 100644
--- a/chromium/third_party/blink/renderer/core/workers/experimental/task_worklet.h
+++ b/chromium/third_party/blink/renderer/core/workers/experimental/task_worklet.h
@@ -5,6 +5,7 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_WORKERS_EXPERIMENTAL_TASK_WORKLET_H_
 #define THIRD_PARTY_BLINK_RENDERER_CORE_WORKERS_EXPERIMENTAL_TASK_WORKLET_H_
 
+#include "third_party/blink/renderer/core/frame/local_dom_window.h"
 #include "third_party/blink/renderer/core/workers/experimental/task.h"
 #include "third_party/blink/renderer/core/workers/worklet.h"
 #include "third_party/blink/renderer/platform/supplementable.h"