Apply again r140703 with all new files

cloud_print/service/service.gyp

Index: cloud_print/service/service.gyp
diff --git a/cloud_print/service/win/service.gyp b/cloud_print/service/service.gyp
similarity index 54%
rename from cloud_print/service/win/service.gyp
rename to cloud_print/service/service.gyp
index b365e839dbc89c8ad7f82b01e3688d5d23961727..096e0d8ff9d354282563b4a6999adb980ea155a6 100644
--- a/cloud_print/service/win/service.gyp
+++ b/cloud_print/service/service.gyp
@@ -7,7 +7,7 @@
       'chromium_code': 1,
     },
     'include_dirs': [
-      '../../..',
+      '<(DEPTH)',
     ],
   },
   'targets': [
@@ -15,27 +15,27 @@
       'target_name': 'cloud_print_service_lib',
       'type': 'static_library',
       'dependencies': [
-        '../../../base/base.gyp:base', 
-        '../../../build/temp_gyp/googleurl.gyp:googleurl',
-        '../../../net/net.gyp:net',
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
+        '<(DEPTH)/net/net.gyp:net',
       ],
       'sources': [
-        'chrome_launcher.cc',
-        'chrome_launcher.h',
         'service_state.cc',
         'service_state.h',
         'service_switches.cc',
         'service_switches.h',
+        'win/chrome_launcher.cc',
+        'win/chrome_launcher.h',
       ]
     },
     {
       'target_name': 'cloud_print_service',
       'type': 'executable',
       'sources': [
-        'cloud_print_service.cc',
-        'cloud_print_service.h',
-        'cloud_print_service.rc',
-        'resource.h',
+        'win/cloud_print_service.cc',
+        'win/cloud_print_service.h',
+        'win/cloud_print_service.rc',
+        'win/resource.h',
       ],
       'dependencies': [
         'cloud_print_service_lib',
@@ -47,20 +47,5 @@
         },
       },
     },
-    {
-      'target_name': 'cloud_print_service_unittests',
-      'type': 'executable',
-      'sources': [
-        'service_state_unittest.cc',
-      ],
-      'dependencies': [
-        '../../../base/base.gyp:run_all_unittests',
-        '../../../base/base.gyp:base',
-        '../../../base/base.gyp:test_support_base',
-        '../../../testing/gmock.gyp:gmock',
-        '../../../testing/gtest.gyp:gtest',
-        'cloud_print_service_lib',
-      ],
-    },
   ],
 }