From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Mon, 12 Oct 2020 14:27:29 +0200
Subject: BASELINE: Update Chromium to 85.0.4183.140

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 chromium/base/profiler/stack_sampler_win.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'chromium/base/profiler/stack_sampler_win.cc')

diff --git a/chromium/base/profiler/stack_sampler_win.cc b/chromium/base/profiler/stack_sampler_win.cc
index c19009b77e4..2a29d4c0ee8 100644
--- a/chromium/base/profiler/stack_sampler_win.cc
+++ b/chromium/base/profiler/stack_sampler_win.cc
@@ -17,14 +17,15 @@ namespace base {
 std::unique_ptr<StackSampler> StackSampler::Create(
     SamplingProfilerThreadToken thread_token,
     ModuleCache* module_cache,
-    std::unique_ptr<Unwinder> native_unwinder,
+    std::vector<std::unique_ptr<Unwinder>> core_unwinders,
     StackSamplerTestDelegate* test_delegate) {
-  DCHECK(!native_unwinder);
+  DCHECK(core_unwinders.empty());
 #if defined(ARCH_CPU_X86_64) || defined(ARCH_CPU_ARM64)
+  core_unwinders.push_back(std::make_unique<NativeUnwinderWin>());
   return std::make_unique<StackSamplerImpl>(
       std::make_unique<StackCopierSuspend>(
           std::make_unique<SuspendableThreadDelegateWin>(thread_token)),
-      std::make_unique<NativeUnwinderWin>(), module_cache, test_delegate);
+      std::move(core_unwinders), module_cache, test_delegate);
 #else
   return nullptr;
 #endif
-- 
cgit v1.2.1