Fix GYP build for Chrome OS to match GN

Fix type in printing.gyp: printing/backend/cups_deleter{,s}.{h,cc}

Disable the cloud print connector like in GN in chrome.gyp

BUG=630791

TEST=Ran `GYP_CHROMIUM_NO_ACTION=0 gclient sync` and verified that chrome compiles

Review-Url: https://codereview.chromium.org/2170123003
Cr-Commit-Position: refs/heads/master@{#407317}

chrome/chrome.gyp

@@ -707,7 +707,7 @@
             '..',
           ],
           'conditions': [
-            ['use_cups==1 and OS!="chromeos"', {
+            ['use_cups==1 and chromeos==0', {
               'dependencies': [
                 '../printing/printing.gyp:cups',
               ],
@@ -715,17 +715,17 @@
                 'service/cloud_print/print_system_cups.cc',
               ],
             }],
-            ['OS!="win" and use_cups!=1', {
-              'sources': [
-                'service/cloud_print/print_system_dummy.cc',
-              ],
-            }],
             ['OS=="win"', {
               'sources': [
                 'service/service_utility_process_host.cc',
                 'service/service_utility_process_host.h',
               ],
             }],
+            ['use_cups!=1 or chromeos==1', {
+              'sources': [
+                'service/cloud_print/print_system_dummy.cc',
+              ],
+            }],
           ],
         },
       ],

printing/printing.gyp

@@ -167,12 +167,19 @@
                 ],
               },
             }],
+          ],
+          '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_deleter.cc',
-                'backend/cups_deleter.h',
+                'backend/cups_deleters.cc',
+                'backend/cups_deleters.h',
                 'backend/cups_ipp_util.cc',
                 'backend/cups_ipp_util.h',
                 'backend/cups_printer.cc',
@@ -188,11 +195,6 @@
               ],
             }],
           ],
-          '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': [