Gyp file cleanup.

BUG=0


Review URL: https://chromiumcodereview.appspot.com/12702004

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

3 files changed, 30 insertions, 54 deletions

diff --git a/cloud_print/service/service.gyp b/cloud_print/service/service.gyp
index 73dfcc1..012c80e 100644
--- a/cloud_print/service/service.gyp
+++ b/cloud_print/service/service.gyp
@@ -5,9 +5,26 @@
   'target_defaults': {
     'variables': {
       'chromium_code': 1,
+      'enable_wexit_time_destructors': 1,
     },
     'include_dirs': [
       '<(DEPTH)',
+      # To allow including "version.h"
+      '<(SHARED_INTERMEDIATE_DIR)',
+    ],
+    'defines' : [
+      'SECURITY_WIN32',
+      'STRICT',
+      '_ATL_APARTMENT_THREADED',
+      '_ATL_CSTRING_EXPLICIT_CONSTRUCTORS',
+      '_ATL_NO_AUTOMATIC_NAMESPACE',
+      '_ATL_NO_EXCEPTIONS',
+    ],
+    'conditions': [
+      ['OS=="win"', {
+        # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+        'msvs_disabled_warnings': [ 4267, ],
+      }],
     ],
   },
   'targets': [
@@ -20,6 +37,14 @@
         '<(DEPTH)/net/net.gyp:net',
         '<(DEPTH)/printing/printing.gyp:printing',
       ],
+      'conditions': [
+        ['OS=="win"', {
+          'dependencies': [
+            '<(DEPTH)/chrome/chrome.gyp:chrome_version_header',
+            '<(DEPTH)/chrome/chrome.gyp:launcher_support',
+          ],
+        }],
+      ],
       'sources': [
         'service_state.cc',
         'service_state.h',
@@ -30,41 +55,18 @@
         'win/local_security_policy.cc',
         'win/local_security_policy.h',
       ],
-      'conditions': [
-        ['OS=="win"', {
-          'dependencies': [
-            '<(DEPTH)/chrome/chrome.gyp:launcher_support',
-          ],
-          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-          'msvs_disabled_warnings': [ 4267, ],
-        }],
-      ],
     },
     {
       'target_name': 'cloud_print_service',
       'type': 'executable',
-      'include_dirs': [
-        # To allow including "version.h"
-        '<(SHARED_INTERMEDIATE_DIR)',
-      ],
       'sources': [
         'win/cloud_print_service.cc',
-        'win/cloud_print_service.h',
         'win/cloud_print_service.rc',
         'win/resource.h',
       ],
       'dependencies': [
         'cloud_print_service_lib',
       ],
-      'conditions': [
-        ['OS=="win"', {
-          'dependencies': [
-            '<(DEPTH)/chrome/chrome.gyp:chrome_version_header',
-          ],
-          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-          'msvs_disabled_warnings': [ 4267, ],
-        }],
-      ],
       'msvs_settings': {
         'VCLinkerTool': {
           'SubSystem': '1',         # Set /SUBSYSTEM:CONSOLE
diff --git a/cloud_print/service/win/cloud_print_service.cc b/cloud_print/service/win/cloud_print_service.cc
index b22c603..8d8279b 100644
--- a/cloud_print/service/win/cloud_print_service.cc
+++ b/cloud_print/service/win/cloud_print_service.cc
@@ -2,9 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cloud_print/service/win/cloud_print_service.h"
+// Service has no COM objects. http://support.microsoft.com/kb/2480736
+#define _ATL_NO_COM_SUPPORT
 
-#define SECURITY_WIN32
+#include <atlbase.h>
+#include <atlcom.h>
+#include <atlctl.h>
 #include <security.h>
 
 #include <iomanip>
diff --git a/cloud_print/service/win/cloud_print_service.h b/cloud_print/service/win/cloud_print_service.h
deleted file mode 100644
index a07189c..0000000
--- a/cloud_print/service/win/cloud_print_service.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// 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.
-
-#ifndef CLOUD_PRINT_SERVICE_CLOUD_PRINT_SERVICE_H_
-#define CLOUD_PRINT_SERVICE_CLOUD_PRINT_SERVICE_H_
-
-#ifndef STRICT
-#define STRICT
-#endif
-
-#define _ATL_FREE_THREADED
-
-#define _ATL_NO_AUTOMATIC_NAMESPACE
-
-// Service has no COM objects. http://support.microsoft.com/kb/2480736
-#define _ATL_NO_COM_SUPPORT
-
-// some CString constructors will be explicit
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS
-
-#define ATL_NO_ASSERT_ON_DESTROY_NONEXISTENT_WINDOW
-
-#include <atlbase.h>
-#include <atlcom.h>
-#include <atlctl.h>
-
-#endif  // CLOUD_PRINT_SERVICE_CLOUD_PRINT_SERVICE_H_
-