Reapply: Fix printing.gyp by joining two 'conditions' dicts together.

printing/printing.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 149 matching lines @@
               # mac_sdk).
               # With a 10.8 deployment target, several other APIs are
               # deprecated.  We're still on CUPS 1.4 until Linux no longer
               # needs to support it, see comment above.
               'xcode_settings': {
                 'WARNING_CFLAGS':  [
                   '-Wno-deprecated-declarations',
                 ],
               },
             }],
-          ],
-          'defines': [
-            # PRINT_BACKEND_AVAILABLE disables the default dummy implementation
-            # of the print backend and enables a custom implementation instead.
-            'PRINT_BACKEND_AVAILABLE',
-          ],
-          'conditions': [
             ['chromeos==1', {
               'sources': [
                 'backend/cups_connection.cc',
                 'backend/cups_connection.h',
                 'backend/cups_deleters.cc',
                 'backend/cups_deleters.h',
                 'backend/cups_ipp_util.cc',
                 'backend/cups_ipp_util.h',
                 'backend/cups_printer.cc',
                 'backend/cups_printer.h',
                 'backend/print_backend_cups_ipp.cc',
                 'backend/print_backend_cups_ipp.h',
               ],
             }, { # chromeos==0
               'sources': [
                 'backend/cups_helper.cc',
                 'backend/cups_helper.h',
                 'backend/print_backend_cups.cc',
               ],
             }],
           ],
+          'defines': [
+            # PRINT_BACKEND_AVAILABLE disables the default dummy implementation
+            # of the print backend and enables a custom implementation instead.
+            'PRINT_BACKEND_AVAILABLE',
+          ],
         }],
         ['OS=="linux" and chromeos==1', {
           'defines': [
             # PRINT_BACKEND_AVAILABLE disables the default dummy implementation
             # of the print backend and enables a custom implementation instead.
             'PRINT_BACKEND_AVAILABLE',
           ],
           'sources': [
             'backend/print_backend_chromeos.cc',
           ],
@@ skipping 144 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'printing_unittests.isolate',
           ],
         },
       ],
     }],
   ]
 }