Revert 64454 - Revert 64441 - Mac cloud print proxy work....

printing/backend/print_backend_cups.cc

 // Copyright (c) 2010 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 <dlfcn.h>
 #include <errno.h>
+#if !defined(OS_MACOSX)
 #include <gcrypt.h>
+#endif
 #include <pthread.h>
 
 #include "base/file_util.h"
 #include "base/lock.h"
 #include "base/logging.h"
 #include "base/singleton.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
 #include "googleurl/src/gurl.h"
 #include "printing/backend/cups_helper.h"
 
+#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:
 // _gcry_ath_mutex_lock: Assertion `*lock == ((ath_mutex_t) 0)' failed."
 // It happened when multiple threads tried printing simultaneously.
 // Google search for 'gnutls thread safety' provided a solution that
 // initialized gcrypt and gnutls.
@@ skipping 26 matching lines @@
       LOG(ERROR) << "Could not find " << kGnuTlsInitFuncName
                  << " in " << kGnuTlsFile;
       return;
     }
     if ((*pgnutls_global_init)() != 0)
       LOG(ERROR) << "Gnutls initialization failed";
   }
 };
 
 }  // namespace
+#endif
 
 namespace printing {
 
 static const char kCUPSPrinterInfoOpt[] = "printer-info";
 static const char kCUPSPrinterStateOpt[] = "printer-state";
 static const char kCUPSPrintServerURL[] = "print_server_url";
 
 class PrintBackendCUPS : public PrintBackend {
  public:
   explicit PrintBackendCUPS(const GURL& print_server_url);
@@ skipping 98 matching lines @@
 
   PrinterList::iterator it;
   for (it = printer_list.begin(); it != printer_list.end(); ++it)
     if (it->printer_name == printer_name)
       return true;
   return false;
 }
 
 scoped_refptr<PrintBackend> PrintBackend::CreateInstance(
     const DictionaryValue* print_backend_settings) {
+#if !defined(OS_MACOSX)
   // Initialize gcrypt library.
   Singleton<GcryptInitializer>::get();
+#endif
 
   std::string print_server_url_str;
   if (print_backend_settings) {
     print_backend_settings->GetString(kCUPSPrintServerURL,
                                       &print_server_url_str);
   }
   GURL print_server_url(print_server_url_str.c_str());
   return new PrintBackendCUPS(print_server_url);
 }
 
@@ skipping 18 matching lines @@
   } else {
     HttpConnectionCUPS http(print_server_url_);
     ppd_file_path = cupsGetPPD2(http.http(), name);
   }
   if (ppd_file_path)
     ppd_path = FilePath(ppd_file_path);
   return ppd_path;
 }
 
 }  // namespace printing