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

printing/backend/print_backend_cups.cc

Index: printing/backend/print_backend_cups.cc
===================================================================
--- printing/backend/print_backend_cups.cc	(revision 64476)
+++ printing/backend/print_backend_cups.cc	(working copy)
@@ -6,7 +6,9 @@
 
 #include <dlfcn.h>
 #include <errno.h>
+#if !defined(OS_MACOSX)
 #include <gcrypt.h>
+#endif
 #include <pthread.h>
 
 #include "base/file_util.h"
@@ -18,6 +20,7 @@
 #include "googleurl/src/gurl.h"
 #include "printing/backend/cups_helper.h"
 
+#if !defined(OS_MACOSX)
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
 
 namespace {
@@ -64,6 +67,7 @@
 };
 
 }  // namespace
+#endif
 
 namespace printing {
 
@@ -182,8 +186,10 @@
 
 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) {
Property changes on: printing/backend/print_backend_cups.cc
___________________________________________________________________
Deleted: svn:mergeinfo