Revert 64441 - Mac cloud print proxy work.

Turn on use_cups for the Mac, add in the required library, and tweak the code
to get it linking.  There is still more work to do; this is just a gyp-oriented
change to get things started.

BUG=none
TEST=All targets still build on all platforms.

Review URL: http://codereview.chromium.org/4167006

TBR=scottbyer@chromium.org
Review URL: http://codereview.chromium.org/4136011

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

2 files changed, 6 insertions, 22 deletions

diff --git a/printing/backend/print_backend_cups.cc b/printing/backend/print_backend_cups.cc
index 09fdf1d..9693299 100644
--- a/printing/backend/print_backend_cups.cc
+++ b/printing/backend/print_backend_cups.cc
@@ -6,9 +6,7 @@
 
 #include <dlfcn.h>
 #include <errno.h>
-#if !defined(OS_MACOSX)
 #include <gcrypt.h>
-#endif
 #include <pthread.h>
 
 #include "base/file_util.h"
@@ -20,7 +18,6 @@
 #include "googleurl/src/gurl.h"
 #include "printing/backend/cups_helper.h"
 
-#if !defined(OS_MACOSX)
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
 
 namespace {
@@ -67,7 +64,6 @@ class GcryptInitializer {
 };
 
 }  // namespace
-#endif
 
 namespace printing {
 
@@ -186,10 +182,8 @@ bool PrintBackendCUPS::IsValidPrinter(const std::string& printer_name) {
 
 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) {
diff --git a/printing/printing.gyp b/printing/printing.gyp
index 7acb6d7..ac87ab3 100644
--- a/printing/printing.gyp
+++ b/printing/printing.gyp
@@ -112,6 +112,12 @@
           ],
         }],
         ['use_cups==1', {
+          'link_settings': {
+            'libraries': [
+              '-lcups',
+              '-lgcrypt',
+            ],
+          },
           'defines': [
             # PRINT_BACKEND_AVAILABLE disables the default dummy implementation
             # of the print backend and enables a custom implementation instead.
@@ -122,22 +128,6 @@
             'backend/cups_helper.h',
             'backend/print_backend_cups.cc',
           ],
-          'conditions': [
-            ['OS=="mac"', {
-              'link_settings': {
-                'libraries': [
-                  '$(SDKROOT)/usr/lib/libcups.dylib',
-                ]
-              },
-            }, {
-              'link_settings': {
-                'libraries': [
-                  '-lcups',
-                  '-lgcrypt',
-                ],
-              },
-            }],              
-          ],
         }],
       ],
     },