| Index: chrome/browser/printing/print_job_worker.cc
|
| diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
|
| index e7cdf14c7fd54397ec6d955098f017c5714e6b00..283a5090570a0d676f143183d66590eaa9f74ac9 100644
|
| --- a/chrome/browser/printing/print_job_worker.cc
|
| +++ b/chrome/browser/printing/print_job_worker.cc
|
| @@ -374,11 +374,9 @@ void PrintJobWorker::OnDocumentDone() {
|
| }
|
|
|
| owner_->PostTask(FROM_HERE,
|
| - base::Bind(&NotificationCallback,
|
| - make_scoped_refptr(owner_),
|
| + base::Bind(&NotificationCallback, base::RetainedRef(owner_),
|
| JobEventDetails::DOC_DONE,
|
| - document_,
|
| - scoped_refptr<PrintedPage>()));
|
| + base::RetainedRef(document_), nullptr));
|
|
|
| // Makes sure the variables are reinitialized.
|
| document_ = NULL;
|
| @@ -389,12 +387,11 @@ void PrintJobWorker::SpoolPage(PrintedPage* page) {
|
| DCHECK_NE(page_number_, PageNumber::npos());
|
|
|
| // Signal everyone that the page is about to be printed.
|
| - owner_->PostTask(FROM_HERE,
|
| - base::Bind(&NotificationCallback,
|
| - make_scoped_refptr(owner_),
|
| - JobEventDetails::NEW_PAGE,
|
| - document_,
|
| - make_scoped_refptr(page)));
|
| + owner_->PostTask(
|
| + FROM_HERE,
|
| + base::Bind(&NotificationCallback, base::RetainedRef(owner_),
|
| + JobEventDetails::NEW_PAGE, base::RetainedRef(document_),
|
| + base::RetainedRef(page)));
|
|
|
| // Preprocess.
|
| if (printing_context_->NewPage() != PrintingContext::OK) {
|
| @@ -416,12 +413,11 @@ void PrintJobWorker::SpoolPage(PrintedPage* page) {
|
| }
|
|
|
| // Signal everyone that the page is printed.
|
| - owner_->PostTask(FROM_HERE,
|
| - base::Bind(&NotificationCallback,
|
| - make_scoped_refptr(owner_),
|
| - JobEventDetails::PAGE_DONE,
|
| - document_,
|
| - make_scoped_refptr(page)));
|
| + owner_->PostTask(
|
| + FROM_HERE,
|
| + base::Bind(&NotificationCallback, base::RetainedRef(owner_),
|
| + JobEventDetails::PAGE_DONE, base::RetainedRef(document_),
|
| + base::RetainedRef(page)));
|
| }
|
|
|
| void PrintJobWorker::OnFailure() {
|
| @@ -431,11 +427,9 @@ void PrintJobWorker::OnFailure() {
|
| scoped_refptr<PrintJobWorkerOwner> handle(owner_);
|
|
|
| owner_->PostTask(FROM_HERE,
|
| - base::Bind(&NotificationCallback,
|
| - make_scoped_refptr(owner_),
|
| + base::Bind(&NotificationCallback, base::RetainedRef(owner_),
|
| JobEventDetails::FAILED,
|
| - document_,
|
| - scoped_refptr<PrintedPage>()));
|
| + base::RetainedRef(document_), nullptr));
|
| Cancel();
|
|
|
| // Makes sure the variables are reinitialized.
|
|
|