Print Preview: Enable tests disabled on ASAN once again.

This time, add an annotation to ignore the leak in system libraries.

BUG=176888,375126

Review URL: https://codereview.chromium.org/321223004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278008 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 2 deletions

diff --git a/printing/backend/print_backend_cups.cc b/printing/backend/print_backend_cups.cc
index e1ddf84..0f2f0e7 100644
--- a/printing/backend/print_backend_cups.cc
+++ b/printing/backend/print_backend_cups.cc
@@ -165,8 +165,7 @@ bool PrintBackendCUPS::GetPrinterCapsAndDefaults(
   base::FilePath ppd_path(GetPPD(printer_name.c_str()));
   // In some cases CUPS failed to get ppd file.
   if (ppd_path.empty()) {
-    LOG(ERROR) << "CUPS: Failed to get PPD"
-               << ", printer name: " << printer_name;
+    LOG(ERROR) << "CUPS: Failed to get PPD, printer name: " << printer_name;
     return false;
   }
 
@@ -241,6 +240,12 @@ scoped_refptr<PrintBackend> PrintBackend::CreateInstance(
 
 int PrintBackendCUPS::GetDests(cups_dest_t** dests) {
   if (print_server_url_.is_empty()) {  // Use default (local) print server.
+    // GnuTLS has a genuine small memory leak that is easier to annotate
+    // than suppress. See http://crbug.com/176888#c7
+    // In theory any CUPS function can trigger this leak, but in
+    // PrintBackendCUPS, this is the most likely spot.
+    // TODO(earthdok): remove this once the leak is fixed.
+    ANNOTATE_SCOPED_MEMORY_LEAK;
     return cupsGetDests(dests);
   } else {
     HttpConnectionCUPS http(print_server_url_, cups_encryption_);