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

chrome/service/cloud_print/print_system_cups.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/print_system.h"
 
 #include <cups/cups.h>
 #include <dlfcn.h>
 #include <errno.h>
 #include <pthread.h>
 #include <stddef.h>
 
 #include <algorithm>
 #include <list>
 #include <map>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/md5.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 695 matching lines @@
 
 scoped_refptr<PrintSystem> PrintSystem::CreateInstance(
     const base::DictionaryValue* print_system_settings) {
   return new PrintSystemCUPS(print_system_settings);
 }
 
 int PrintSystemCUPS::PrintFile(const GURL& url, http_encryption_t encryption,
                                const char* name, const char* filename,
                                const char* title, int num_options,
                                cups_option_t* options) {
-  if (url.is_empty()) {  // Use default (local) print server.
+  // Use default (local) print server.
+  if (url.is_empty())
     return cupsPrintFile(name, filename, title, num_options, options);
-  } else {
-    printing::HttpConnectionCUPS http(url, encryption);
-    http.SetBlocking(false);
-    return cupsPrintFile2(http.http(), name, filename,
-                          title, num_options, options);
-  }
+
+  printing::HttpConnectionCUPS http(url, encryption);
+  http.SetBlocking(false);
+  return cupsPrintFile2(http.http(), name, filename, title, num_options,
+                        options);
 }
 
 int PrintSystemCUPS::GetJobs(cups_job_t** jobs, const GURL& url,
                              http_encryption_t encryption,
                              const char* name, int myjobs, int whichjobs) {
-  if (url.is_empty()) {  // Use default (local) print server.
+  // Use default (local) print server.
+  if (url.is_empty())
     return cupsGetJobs(jobs, name, myjobs, whichjobs);
-  } else {
-    printing::HttpConnectionCUPS http(url, encryption);
-    http.SetBlocking(false);
-    return cupsGetJobs2(http.http(), jobs, name, myjobs, whichjobs);
-  }
+
+  printing::HttpConnectionCUPS http(url, encryption);
+  http.SetBlocking(false);
+  return cupsGetJobs2(http.http(), jobs, name, myjobs, whichjobs);
 }
 
 PlatformJobId PrintSystemCUPS::SpoolPrintJob(
     const std::string& print_ticket,
     const base::FilePath& print_data_file_path,
     const std::string& print_data_mime_type,
     const std::string& printer_name,
     const std::string& job_title,
     const std::vector<std::string>& tags,
     bool* dry_run) {
@@ skipping 26 matching lines @@
   std::vector<cups_option_t> cups_options;
   std::map<std::string, std::string>::iterator it;
 
   for (it = options.begin(); it != options.end(); ++it) {
     cups_option_t opt;
     opt.name = const_cast<char*>(it->first.c_str());
     opt.value = const_cast<char*>(it->second.c_str());
     cups_options.push_back(opt);
   }
 
-  int job_id = PrintFile(server_info->url,
-                         cups_encryption_,
-                         short_printer_name.c_str(),
-                         print_data_file_path.value().c_str(),
-                         job_title.c_str(),
-                         cups_options.size(),
-                         &(cups_options[0]));
+  int job_id =
+      PrintFile(server_info->url, cups_encryption_, short_printer_name.c_str(),
+                print_data_file_path.value().c_str(), job_title.c_str(),
+                cups_options.size(), cups_options.data());
+  base::DeleteFile(print_data_file_path, false);
 
   // TODO(alexyu): Output printer id.
   VLOG(1) << "CP_CUPS: Job spooled"
           << ", printer name: " << printer_name
           << ", cups job id: " << job_id;
 
   return job_id;
 }
 
 std::string PrintSystemCUPS::MakeFullPrinterName(
@@ skipping 42 matching lines @@
 
 void PrintSystemCUPS::RunCapsCallback(
     const PrinterCapsAndDefaultsCallback& callback,
     bool succeeded,
     const std::string& printer_name,
     const printing::PrinterCapsAndDefaults& printer_info) {
   callback.Run(succeeded, printer_name, printer_info);
 }
 
 }  // namespace cloud_print