Merge branch 'master' into roller/chromium/master

This commit is contained in:
Jeremy Rose 2021-03-30 09:47:35 -07:00 committed by GitHub
commit 5d13820441
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 226 additions and 103 deletions

View file

@ -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() {