Merge to M51: Cloud Print Proxy: Delete print jobs.

chrome/service/cloud_print/printer_job_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/service/cloud_print/printer_job_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
@@ skipping 231 matching lines @@
   // Some job on the printer changed. Loop through all our JobStatusUpdaters
   // and have them check for updates.
   for (JobStatusUpdaterList::iterator index = job_status_updater_list_.begin();
        index != job_status_updater_list_.end(); index++) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(&JobStatusUpdater::UpdateStatus, index->get()));
   }
 }
 
 void PrinterJobHandler::OnJobSpoolSucceeded(const PlatformJobId& job_id) {
-  DCHECK(base::MessageLoop::current() == print_thread_.message_loop());
+  DCHECK(CurrentlyOnPrintThread());
   job_spooler_->AddRef();
   print_thread_.message_loop()->ReleaseSoon(FROM_HERE, job_spooler_.get());
   job_spooler_ = NULL;
   job_handler_task_runner_->PostTask(
       FROM_HERE, base::Bind(&PrinterJobHandler::JobSpooled, this, job_id));
 }
 
 void PrinterJobHandler::OnJobSpoolFailed() {
-  DCHECK(base::MessageLoop::current() == print_thread_.message_loop());
+  DCHECK(CurrentlyOnPrintThread());
   job_spooler_->AddRef();
   print_thread_.message_loop()->ReleaseSoon(FROM_HERE, job_spooler_.get());
   job_spooler_ = NULL;
   VLOG(1) << "CP_CONNECTOR: Job failed (spool failed)";
   job_handler_task_runner_->PostTask(
       FROM_HERE, base::Bind(&PrinterJobHandler::JobFailed, this, JOB_FAILED));
 }
 
 // static
 void PrinterJobHandler::ReportsStats() {
@@ skipping 505 matching lines @@
         std::string());
   } else {
     // We are done here. Go to the Stop state
     VLOG(1) << "CP_CONNECTOR: Stopping printer job handler"
             << ", printer name: " << printer_name;
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(&PrinterJobHandler::Stop, this));
   }
 }
 
-// The following methods are called on |print_thread_|. It is not safe to
-// access any members other than |job_handler_task_runner_|,
-// |job_spooler_| and |print_system_|.
 void PrinterJobHandler::DoPrint(const JobDetails& job_details,
                                 const std::string& printer_name) {
+  DCHECK(CurrentlyOnPrintThread());
   job_spooler_ = print_system_->CreateJobSpooler();
   UMA_HISTOGRAM_LONG_TIMES("CloudPrint.PrepareTime",
                            base::Time::Now() - job_start_time_);
   DCHECK(job_spooler_.get());
-  if (!job_spooler_.get())
-    return;
 
   base::string16 document_name =
       job_details.job_title_.empty()
           ? l10n_util::GetStringUTF16(IDS_DEFAULT_PRINT_DOCUMENT_TITLE)
           : base::UTF8ToUTF16(job_details.job_title_);
 
   document_name = printing::FormatDocumentTitleWithOwner(
       base::UTF8ToUTF16(job_details.job_owner_), document_name);
 
   UMA_HISTOGRAM_ENUMERATION("CloudPrint.JobHandlerEvent",
                             JOB_HANDLER_START_SPOOLING, JOB_HANDLER_MAX);
   spooling_start_time_ = base::Time::Now();
   if (!job_spooler_->Spool(job_details.print_ticket_,
                            job_details.print_ticket_mime_type_,
                            job_details.print_data_file_path_,
                            job_details.print_data_mime_type_,
                            printer_name,
                            base::UTF16ToUTF8(document_name),
                            job_details.tags_,
                            this)) {
     OnJobSpoolFailed();
   }
 }
 
+bool PrinterJobHandler::CurrentlyOnPrintThread() const {
+  return base::MessageLoop::current() == print_thread_.message_loop();
+}
+
 }  // namespace cloud_print