Valgrind: Fix some leaks in the CUPS printing code and remove a no longer supported OS X 10.5 check.

printing/backend/print_backend_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 "printing/backend/print_backend.h"
 
 #include "build/build_config.h"
 
 #include <dlfcn.h>
 #include <errno.h>
 #include <pthread.h>
 
 #if defined(OS_MACOSX)
 #include <AvailabilityMacros.h>
 #else
 #include <gcrypt.h>
 #endif
 
 #include "base/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/synchronization/lock.h"
 #include "base/values.h"
 #include "googleurl/src/gurl.h"
 #include "printing/backend/cups_helper.h"
 #include "printing/backend/print_backend_consts.h"
 
-#if (defined(OS_MACOSX) && \
-     MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5) || \
-    (defined(OS_LINUX) && \
-     CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 4)
+#if (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 4)
 const int CUPS_PRINTER_SCANNER = 0x2000000;  // Scanner-only device
 #endif
 
 #if !defined(OS_MACOSX)
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
 
 namespace {
 
 // Init GCrypt library (needed for CUPS) using pthreads.
 // There exists a bug in CUPS library, where it crashed with: "ath.c:184:
@@ skipping 160 matching lines @@
           << ", server: " << print_server_url_
           << ", # of printers: " << printer_list->size();
   return true;
 }
 
 std::string PrintBackendCUPS::GetDefaultPrinterName() {
   // Not using cupsGetDefault() because it lies about the default printer.
   cups_dest_t* dests;
   int num_dests = GetDests(&dests);
   cups_dest_t* dest = cupsGetDest(NULL, NULL, num_dests, dests);
-  return dest ? std::string(dest->name) : std::string();
+  std::string name = dest ? std::string(dest->name) : std::string();
+  cupsFreeDests(num_dests, dests);
+  return name;
 }
 
 bool PrintBackendCUPS::GetPrinterSemanticCapsAndDefaults(
     const std::string& printer_name,
     PrinterSemanticCapsAndDefaults* printer_info) {
   PrinterCapsAndDefaults info;
   if (!GetPrinterCapsAndDefaults(printer_name, &info) )
     return false;
 
   return parsePpdCapabilities(
@@ skipping 143 matching lines @@
                    << ", HTTP error: " << http_error;
         file_util::Delete(ppd_path, false);
         ppd_path.clear();
       }
     }
   }
   return ppd_path;
 }
 
 }  // namespace printing