Revert of Fix typo in printing.gyp (patchset #3 id:40001 of...

Revert of Fix typo in printing.gyp (patchset #3 id:40001 of https://codereview.chromium.org/2170123003/ )

Reason for revert:
Broke "Win8 GYP (dbg)" bot.

https://build.chromium.org/p/chromium.win/builders/Win8%20GYP%20%28dbg%29/builds/978

python.exe gyp-win-tool link-with-manifests environment.x86 True initial\chrome.dll
error LNK2005: "public: static class scoped_refptr<class cloud_print::PrintSystem> __cdecl cloud_print::PrintSystem::CreateInstance(...)

initial\chrome.dll : fatal error LNK1169: one or more multiply defined symbols found

Original issue's description:
> 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
>
> Committed: https://crrev.com/d9e819815d379eb2492514ddb8158def89314311
> Cr-Commit-Position: refs/heads/master@{#407317}

TBR=emircan@chromium.org,skau@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=630791

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

chrome/chrome.gyp

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

printing/printing.gyp

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