Fix build issues after 75-merge

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

5 files changed, 12 insertions, 3 deletions

diff --git a/chromium/cc/scheduler/compositor_frame_reporting_controller.cc b/chromium/cc/scheduler/compositor_frame_reporting_controller.cc
index f1587ed158d..777d5f8c00c 100644
--- a/chromium/cc/scheduler/compositor_frame_reporting_controller.cc
+++ b/chromium/cc/scheduler/compositor_frame_reporting_controller.cc
@@ -31,8 +31,8 @@ void CompositorFrameReportingController::WillBeginImplFrame() {
 
 void CompositorFrameReportingController::WillBeginMainFrame() {
   DCHECK(reporters_[PipelineStage::kBeginImplFrame]);
-  DCHECK_NE(reporters_[PipelineStage::kBeginMainFrame],
-            reporters_[PipelineStage::kBeginImplFrame]);
+  DCHECK_NE(reporters_[PipelineStage::kBeginMainFrame].get(),
+            reporters_[PipelineStage::kBeginImplFrame].get());
   reporters_[PipelineStage::kBeginImplFrame]->StartStage(
       "SendBeginMainFrameToCommit");
   AdvanceReporterStage(PipelineStage::kBeginImplFrame,
diff --git a/chromium/content/browser/storage_partition_impl.cc b/chromium/content/browser/storage_partition_impl.cc
index ab64e8ae556..9936ea38ca4 100644
--- a/chromium/content/browser/storage_partition_impl.cc
+++ b/chromium/content/browser/storage_partition_impl.cc
@@ -289,9 +289,10 @@ class StoragePartitionImpl::NetworkContextOwner {
     network::mojom::NetworkContextParamsPtr network_context_params =
         network::mojom::NetworkContextParams::New();
     content::UpdateCorsExemptHeader(network_context_params.get());
+#if !defined(TOOLKIT_QT)
     variations::UpdateCorsExemptHeaderForVariations(
-
         network_context_params.get());
+#endif
     context_getter_ = std::move(context_getter);
     network_context_ = std::make_unique<network::NetworkContext>(
         GetNetworkServiceImpl(), std::move(network_context_request),
diff --git a/chromium/content/public/common/content_features.cc b/chromium/content/public/common/content_features.cc
index 2b583c5e388..ec2cb046f41 100644
--- a/chromium/content/public/common/content_features.cc
+++ b/chromium/content/public/common/content_features.cc
@@ -4,6 +4,7 @@
 
 #include "content/public/common/content_features.h"
 #include "build/build_config.h"
+#include "net/net_buildflags.h"
 
 namespace features {
 
diff --git a/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc b/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc
index a5b07732486..6b39071b60d 100644
--- a/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc
+++ b/chromium/services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc
@@ -7,8 +7,10 @@
 #include <stdint.h>
 #include <memory>
 
+#if defined(OS_ANDROID)
 #include "base/android/library_loader/anchor_functions.h"
 #include "base/android/library_loader/anchor_functions_buildflags.h"
+#endif
 #include "base/debug/elf_reader.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_file.h"
diff --git a/chromium/v8/src/objects/js-objects.cc b/chromium/v8/src/objects/js-objects.cc
index 841eec0edf4..83b410f4fb0 100644
--- a/chromium/v8/src/objects/js-objects.cc
+++ b/chromium/v8/src/objects/js-objects.cc
@@ -3792,6 +3792,11 @@ void JSObject::ApplyAttributesToDictionary(
   }
 }
 
+template
+void JSObject::ApplyAttributesToDictionary<v8::internal::NumberDictionary>(
+    Isolate* isolate, ReadOnlyRoots roots, Handle<v8::internal::NumberDictionary> dictionary,
+    const PropertyAttributes attributes);
+
 template <PropertyAttributes attrs>
 Maybe<bool> JSObject::PreventExtensionsWithTransition(
     Handle<JSObject> object, ShouldThrow should_throw) {