Commit 86abbc22 authored by Mostyn Bramley-Moore's avatar Mostyn Bramley-Moore Committed by Commit Bot

[jumbo] avoid HoldRefCallback collision

CL https://chromium-review.googlesource.com/c/chromium/src/+/1013118 added
a HoldRefCallback function to print_job_worker.cc which conflicts with
an identically named function in print_job.cc in jumbo builds.  Let's
rename this one.

Change-Id: I41d6c064c968bd72c736d648439a372cc4ca64a1
Reviewed-on: https://chromium-review.googlesource.com/1013495Reviewed-by: default avatarLei Zhang <thestig@chromium.org>
Reviewed-by: default avatarRebekah Potter <rbpotter@chromium.org>
Commit-Queue: Mostyn Bramley-Moore <mostynb@vewd.com>
Cr-Commit-Position: refs/heads/master@{#551407}
parent d526111e
...@@ -103,8 +103,8 @@ void NotificationCallback(PrintJob* print_job, ...@@ -103,8 +103,8 @@ void NotificationCallback(PrintJob* print_job,
} }
// Helper function to ensure |query| is valid until at least |callback| returns. // Helper function to ensure |query| is valid until at least |callback| returns.
void HoldRefCallback(scoped_refptr<PrinterQuery> query, void WorkerHoldRefCallback(scoped_refptr<PrinterQuery> query,
base::OnceClosure callback) { base::OnceClosure callback) {
std::move(callback).Run(); std::move(callback).Run();
} }
...@@ -112,7 +112,7 @@ void PostOnQueryThread(scoped_refptr<PrinterQuery> query, ...@@ -112,7 +112,7 @@ void PostOnQueryThread(scoped_refptr<PrinterQuery> query,
PrintingContext::PrintSettingsCallback callback, PrintingContext::PrintSettingsCallback callback,
PrintingContext::Result result) { PrintingContext::Result result) {
query->PostTask(FROM_HERE, query->PostTask(FROM_HERE,
base::BindOnce(&HoldRefCallback, query, base::BindOnce(&WorkerHoldRefCallback, query,
base::BindOnce(std::move(callback), result))); base::BindOnce(std::move(callback), result)));
} }
...@@ -197,14 +197,14 @@ void PrintJobWorker::GetSettings(bool ask_user_for_settings, ...@@ -197,14 +197,14 @@ void PrintJobWorker::GetSettings(bool ask_user_for_settings,
BrowserThread::PostTask( BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE, BrowserThread::UI, FROM_HERE,
base::BindOnce( base::BindOnce(
&HoldRefCallback, base::WrapRefCounted(query_), &WorkerHoldRefCallback, base::WrapRefCounted(query_),
base::BindOnce(&PrintJobWorker::GetSettingsWithUI, base::BindOnce(&PrintJobWorker::GetSettingsWithUI,
base::Unretained(this), document_page_count, base::Unretained(this), document_page_count,
has_selection, is_scripted))); has_selection, is_scripted)));
} else { } else {
BrowserThread::PostTask( BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE, BrowserThread::UI, FROM_HERE,
base::BindOnce(&HoldRefCallback, base::WrapRefCounted(query_), base::BindOnce(&WorkerHoldRefCallback, base::WrapRefCounted(query_),
base::BindOnce(&PrintJobWorker::UseDefaultSettings, base::BindOnce(&PrintJobWorker::UseDefaultSettings,
base::Unretained(this)))); base::Unretained(this))));
} }
...@@ -218,7 +218,7 @@ void PrintJobWorker::SetSettings( ...@@ -218,7 +218,7 @@ void PrintJobWorker::SetSettings(
BrowserThread::PostTask( BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE, BrowserThread::UI, FROM_HERE,
base::BindOnce( base::BindOnce(
&HoldRefCallback, base::WrapRefCounted(query_), &WorkerHoldRefCallback, base::WrapRefCounted(query_),
base::BindOnce(&PrintJobWorker::UpdatePrintSettings, base::BindOnce(&PrintJobWorker::UpdatePrintSettings,
base::Unretained(this), std::move(new_settings)))); base::Unretained(this), std::move(new_settings))));
} }
...@@ -232,7 +232,7 @@ void PrintJobWorker::SetSettingsFromPOD( ...@@ -232,7 +232,7 @@ void PrintJobWorker::SetSettingsFromPOD(
BrowserThread::PostTask( BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE, BrowserThread::UI, FROM_HERE,
base::BindOnce( base::BindOnce(
&HoldRefCallback, base::WrapRefCounted(query_), &WorkerHoldRefCallback, base::WrapRefCounted(query_),
base::BindOnce(&PrintJobWorker::UpdatePrintSettingsFromPOD, base::BindOnce(&PrintJobWorker::UpdatePrintSettingsFromPOD,
base::Unretained(this), std::move(new_settings)))); base::Unretained(this), std::move(new_settings))));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment