Merge branch 'master' into roller/chromium/master
This commit is contained in:
commit
5d13820441
28 changed files with 226 additions and 103 deletions
|
@ -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() {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue