Remove calls to deprecated CUPS API

httpConnect2 became preferred in CUPS 1.7.  We expect that all supported
clients are now past this CUPS version.

Bug: 1020356
Change-Id: Id97a50beac7ac1d6b7f6ecd10a8e8c6303b3d4e2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2043031
Auto-Submit: Sean Kau <skau@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Reviewed-by: Daniel Hosseinian <dhoss@chromium.org>
Cr-Commit-Position: refs/heads/master@{#740195}

Author: Sean Kau

chrome/service/cloud_print/print_system_cups.cc

@@ -726,8 +726,7 @@ int PrintSystemCUPS::PrintFile(const GURL& url,
   if (url.is_empty())
     return cupsPrintFile(name, filename, title, num_options, options);
 
-  printing::HttpConnectionCUPS http(url, encryption);
-  http.SetBlocking(false);
+  printing::HttpConnectionCUPS http(url, encryption, /*blocking=*/false);
   return cupsPrintFile2(http.http(), name, filename, title, num_options,
                         options);
 }
@@ -743,8 +742,7 @@ int PrintSystemCUPS::GetJobs(cups_job_t** jobs,
   if (url.is_empty())
     return cupsGetJobs(jobs, name, myjobs, whichjobs);
 
-  printing::HttpConnectionCUPS http(url, encryption);
-  http.SetBlocking(false);
+  printing::HttpConnectionCUPS http(url, encryption, /*blocking=*/false);
   return cupsGetJobs2(http.http(), jobs, name, myjobs, whichjobs);
 }
 

printing/BUILD.gn

@@ -165,24 +165,15 @@ component("printing") {
     if (is_linux) {
       cflags += [
         # CUPS 1.6 deprecated the PPD APIs, but we will stay with this
-        # API for now as supported Linux and Mac OS'es are still using
-        # older versions of CUPS. More info: crbug.com/226176
+        # API for now as the suitability of the replacement is unclear.
+        # More info: crbug.com/226176
         "-Wno-deprecated-declarations",
-        # CUPS 1.7 deprecates httpConnectEncrypt(), see the mac section
-        # below.
       ]
     }
 
     if (is_mac) {
-      # The 10.9 SDK includes cups 1.7, which deprecates
-      # httpConnectEncrypt() in favor of httpConnect2(). hhttpConnect2()
-      # is new in 1.7, so it doesn't exist on OS X 10.6-10.8 and we
-      # can't use it until 10.9 is our minimum system version.
-      # (cups_version isn't reliable on OS X, so key the check off of
-      # mac_sdk).
-      # With a 10.8 deployment target, several other APIs are deprecated.
-      # We're still on CUPS 1.4 until Linux no longer needs to support it, see
-      # comment above.
+      # CUPS 1.6 deprecated the PPD APIs. We need to evaluate the
+      # effect of migrating Mac. More info: crbug.com/226176
       cflags += [ "-Wno-deprecated-declarations" ]
     }
 

printing/backend/cups_helper.cc

@@ -17,6 +17,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
+#include "base/time/time.h"
 #include "base/values.h"
 #include "printing/backend/print_backend.h"
 #include "printing/backend/print_backend_consts.h"
@@ -31,6 +32,10 @@ namespace printing {
 // This section contains helper code for PPD parsing for semantic capabilities.
 namespace {
 
+// Timeout for establishing a CUPS connection.  It is expected that cupsd is
+// able to start and respond on all systems within this duration.
+constexpr base::TimeDelta kCupsTimeout = base::TimeDelta::FromSeconds(5);
+
 constexpr char kColorDevice[] = "ColorDevice";
 constexpr char kColorModel[] = "ColorModel";
 constexpr char kColorMode[] = "ColorMode";
@@ -524,7 +529,8 @@ const int kDefaultIPPServerPort = 631;
 // Helper wrapper around http_t structure, with connection and cleanup
 // functionality.
 HttpConnectionCUPS::HttpConnectionCUPS(const GURL& print_server_url,
-                                       http_encryption_t encryption)
+                                       http_encryption_t encryption,
+                                       bool blocking)
     : http_(nullptr) {
   // If we have an empty url, use default print server.
   if (print_server_url.is_empty())
@@ -533,8 +539,11 @@ HttpConnectionCUPS::HttpConnectionCUPS(const GURL& print_server_url,
   int port = print_server_url.IntPort();
   if (port == url::PORT_UNSPECIFIED)
     port = kDefaultIPPServerPort;
+  http_ =
+      httpConnect2(print_server_url.host().c_str(), port, /*addrlist=*/nullptr,
+                   AF_UNSPEC, encryption, blocking ? 1 : 0,
+                   kCupsTimeout.InMilliseconds(), /*cancel=*/nullptr);
 
-  http_ = httpConnectEncrypt(print_server_url.host().c_str(), port, encryption);
   if (!http_) {
     LOG(ERROR) << "CP_CUPS: Failed connecting to print server: "
                << print_server_url;
@@ -546,10 +555,6 @@ HttpConnectionCUPS::~HttpConnectionCUPS() {
     httpClose(http_);
 }
 
-void HttpConnectionCUPS::SetBlocking(bool blocking) {
-  httpBlocking(http_, blocking ? 1 : 0);
-}
-
 http_t* HttpConnectionCUPS::http() {
   return http_;
 }

printing/backend/cups_helper.h

@@ -23,11 +23,10 @@ struct PrinterSemanticCapsAndDefaults;
 class PRINTING_EXPORT HttpConnectionCUPS {
  public:
   HttpConnectionCUPS(const GURL& print_server_url,
-                     http_encryption_t encryption);
+                     http_encryption_t encryption,
+                     bool blocking);
   ~HttpConnectionCUPS();
 
-  void SetBlocking(bool blocking);
-
   http_t* http();
 
  private:

printing/backend/print_backend_cups.cc

@@ -238,8 +238,7 @@ int PrintBackendCUPS::GetDests(cups_dest_t** dests) {
   if (print_server_url_.is_empty())
     return cupsGetDests2(CUPS_HTTP_DEFAULT, dests);
 
-  HttpConnectionCUPS http(print_server_url_, cups_encryption_);
-  http.SetBlocking(blocking_);
+  HttpConnectionCUPS http(print_server_url_, cups_encryption_, blocking_);
 
   // This call must be made in the same scope as |http| because its destructor
   // closes the connection.
@@ -265,8 +264,7 @@ base::FilePath PrintBackendCUPS::GetPPD(const char* name) {
     // connection will timeout after 10 seconds of no data period. And it will
     // return the same way as if data was completely and successfully
     // downloaded.
-    HttpConnectionCUPS http(print_server_url_, cups_encryption_);
-    http.SetBlocking(blocking_);
+    HttpConnectionCUPS http(print_server_url_, cups_encryption_, blocking_);
     ppd_file_path = cupsGetPPD2(http.http(), name);
     // Check if the get full PPD, since non-blocking call may simply return
     // normally after timeout expired.
@@ -302,8 +300,7 @@ PrintBackendCUPS::ScopedDestination PrintBackendCUPS::GetNamedDest(
     // Use default (local) print server.
     dest = cupsGetNamedDest(CUPS_HTTP_DEFAULT, printer_name.c_str(), nullptr);
   } else {
-    HttpConnectionCUPS http(print_server_url_, cups_encryption_);
-    http.SetBlocking(blocking_);
+    HttpConnectionCUPS http(print_server_url_, cups_encryption_, blocking_);
     dest = cupsGetNamedDest(http.http(), printer_name.c_str(), nullptr);
   }
   return ScopedDestination(dest);