Merge branch 'master' into roller/chromium/master

2021-03-30 09:47:35 -07:00 · 2021-03-30 09:47:35 -07:00 · 5d13820441
commit 5d13820441
parent 1f575ca3af c9217f07e6
28 changed files with 226 additions and 103 deletions
--- a/shell/browser/api/electron_api_crash_reporter.cc
+++ b/shell/browser/api/electron_api_crash_reporter.cc
@ -190,8 +190,9 @@ namespace {

 #if defined(MAS_BUILD)
 void GetUploadedReports(
+    v8::Isolate* isolate,
    base::OnceCallback<void(v8::Local<v8::Value>)> callback) {
-  std::move(callback).Run(v8::Array::New(v8::Isolate::GetCurrent()));
+  std::move(callback).Run(v8::Array::New(isolate));
 }
 #else
 scoped_refptr<UploadList> CreateCrashUploadList() {