Chromium Code Reviews| Index: chrome/service/cloud_print/print_system_win.cc |
| diff --git a/chrome/service/cloud_print/print_system_win.cc b/chrome/service/cloud_print/print_system_win.cc |
| index 84d9169e81f5aed3372be0aca7c1588c53fdfd6a..ed304c767b59f7bd35ae32c44a77443858a6ba7f 100644 |
| --- a/chrome/service/cloud_print/print_system_win.cc |
| +++ b/chrome/service/cloud_print/print_system_win.cc |
| @@ -360,7 +360,7 @@ class JobSpoolerWin : public PrintSystem::JobSpooler { |
| tracked_objects::ScopedTracker tracking_profile( |
| FROM_HERE_WITH_EXPLICIT_FUNCTION("Core_OnObjectSignaled")); |
| - DCHECK(xps_print_job_); |
| + DCHECK(xps_print_job_.get()); |
| DCHECK(object == job_progress_event_.Get()); |
| ResetEvent(job_progress_event_.Get()); |
| if (!delegate_) |
| @@ -391,7 +391,7 @@ class JobSpoolerWin : public PrintSystem::JobSpooler { |
| : job_ptr_(job_ptr) { |
| } |
| ~PrintJobCanceler() { |
| - if (job_ptr_ && *job_ptr_) { |
| + if (job_ptr_ && job_ptr_->get()) { |
|
dcheng
2014/11/12 23:01:32
This seems pretty sketchy. I have a TODO to come b
|
| (*job_ptr_)->Cancel(); |
| job_ptr_->Release(); |
| } |
| @@ -443,7 +443,7 @@ class JobSpoolerWin : public PrintSystem::JobSpooler { |
| DCHECK(g_service_process->io_thread()->message_loop_proxy()-> |
| BelongsToCurrentThread()); |
| scoped_ptr<ServiceUtilityProcessHost> utility_host( |
| - new ServiceUtilityProcessHost(this, client_message_loop_proxy)); |
| + new ServiceUtilityProcessHost(this, client_message_loop_proxy.get())); |
| // TODO(gene): For now we disabling autorotation for CloudPrinting. |
| // Landscape/Portrait setting is passed in the print ticket and |
| // server is generating portrait PDF always. |
| @@ -589,7 +589,7 @@ class PrinterCapsHandler : public ServiceUtilityProcessHost::Client { |
| DCHECK(g_service_process->io_thread()->message_loop_proxy()-> |
| BelongsToCurrentThread()); |
| scoped_ptr<ServiceUtilityProcessHost> utility_host( |
| - new ServiceUtilityProcessHost(this, client_message_loop_proxy)); |
| + new ServiceUtilityProcessHost(this, client_message_loop_proxy.get())); |
| if (utility_host->StartGetPrinterCapsAndDefaults(printer_name_)) { |
| // The object will self-destruct when the child process dies. |
| utility_host.release(); |
| @@ -606,7 +606,7 @@ class PrinterCapsHandler : public ServiceUtilityProcessHost::Client { |
| DCHECK(g_service_process->io_thread()->message_loop_proxy()-> |
| BelongsToCurrentThread()); |
| scoped_ptr<ServiceUtilityProcessHost> utility_host( |
| - new ServiceUtilityProcessHost(this, client_message_loop_proxy)); |
| + new ServiceUtilityProcessHost(this, client_message_loop_proxy.get())); |
| if (utility_host->StartGetPrinterSemanticCapsAndDefaults(printer_name_)) { |
| // The object will self-destruct when the child process dies. |
| utility_host.release(); |