Remove msvs_express and secure_atl settings

These are no longer required as the Community edition of VS is the same
as Professional from Chrome's point of view, and includes MFC, ATL
and the amd64_x86 toolchain. So, simplify the build.

Also note that this means we only ever build with tool binaries that
are x64 targetting either x86 or x64.

R=dpranke@chromium.org
TBR=cpu@chromium.org
BUG=433551, 432748, 5027

Review URL: https://codereview.chromium.org/731323002

Cr-Commit-Position: refs/heads/master@{#304510}

3 files changed, 13 insertions, 82 deletions

diff --git a/build/common.gypi b/build/common.gypi
index 21cee7f..41ecb9c 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1949,13 +1949,6 @@
           },{
             'msvs_large_module_debug_link_mode%': '2',  # Yes
           }],
-          ['MSVS_VERSION=="2013e"', {
-            'msvs_express%': 1,
-            'secure_atl%': 0,
-          },{
-            'msvs_express%': 0,
-            'secure_atl%': 1,
-          }],
         ],
         'nacl_win64_defines': [
           # This flag is used to minimize dependencies when building
@@ -5274,6 +5267,7 @@
           'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS',
           'WIN32_LEAN_AND_MEAN',
           '_ATL_NO_OPENGL',
+          '_SECURE_ATL',
           # _HAS_EXCEPTIONS must match ExceptionHandling in msvs_settings.
           '_HAS_EXCEPTIONS=0',
           # Silence some warnings; we can't switch the the 'recommended'
@@ -5354,62 +5348,6 @@
               4702,
             ],
           }],
-          ['secure_atl', {
-            'defines': [
-              '_SECURE_ATL',
-            ],
-          }],
-          ['msvs_express', {
-            'configurations': {
-              'x86_Base': {
-                'msvs_settings': {
-                  'VCLinkerTool': {
-                    'AdditionalLibraryDirectories':
-                      ['<(windows_driver_kit_path)/lib/ATL/i386'],
-                  },
-                  'VCLibrarianTool': {
-                    'AdditionalLibraryDirectories':
-                      ['<(windows_driver_kit_path)/lib/ATL/i386'],
-                  },
-                },
-              },
-              'x64_Base': {
-                'msvs_settings': {
-                  'VCLibrarianTool': {
-                    'AdditionalLibraryDirectories':
-                      ['<(windows_driver_kit_path)/lib/ATL/amd64'],
-                  },
-                  'VCLinkerTool': {
-                    'AdditionalLibraryDirectories':
-                      ['<(windows_driver_kit_path)/lib/ATL/amd64'],
-                  },
-                },
-              },
-            },
-            'msvs_settings': {
-              'VCCLCompilerTool': {
-                'AdditionalOptions!': [
-                    '/Zc:inline',  # Not supported on non-updated Express.
-                ],
-              },
-              'VCLinkerTool': {
-                # Explicitly required when using the ATL with express
-                'AdditionalDependencies': ['atlthunk.lib'],
-
-                # ATL 8.0 included in WDK 7.1 makes the linker to generate
-                # almost eight hundred LNK4254 and LNK4078 warnings:
-                #   - warning LNK4254: section 'ATL' (50000040) merged into
-                #     '.rdata' (40000040) with different attributes
-                #   - warning LNK4078: multiple 'ATL' sections found with
-                #     different attributes
-                'AdditionalOptions': ['/ignore:4254', '/ignore:4078'],
-              },
-            },
-            'msvs_system_include_dirs': [
-              '<(windows_driver_kit_path)/inc/atl71',
-              '<(windows_driver_kit_path)/inc/mfc42',
-            ],
-          }],
         ],
         'msvs_system_include_dirs': [
           '<(windows_sdk_path)/Include/shared',
diff --git a/third_party/qcms/qcms.gyp b/third_party/qcms/qcms.gyp
index 298f615..6f33aba 100644
--- a/third_party/qcms/qcms.gyp
+++ b/third_party/qcms/qcms.gyp
@@ -47,7 +47,7 @@
             'src/transform-sse1.c',
           ],
         }],
-        ['OS == "win" and (MSVS_VERSION == "2013" or MSVS_VERSION == "2013e")', {
+        ['OS == "win"', {
           'msvs_disabled_warnings': [
             4056,  # overflow in floating-point constant arithmetic (INFINITY)
             4756,  # overflow in constant arithmetic (INFINITY)
diff --git a/tools/win/static_initializers/static_initializers.gyp b/tools/win/static_initializers/static_initializers.gyp
index 724091f..ee4102f 100644
--- a/tools/win/static_initializers/static_initializers.gyp
+++ b/tools/win/static_initializers/static_initializers.gyp
@@ -6,23 +6,16 @@
   'variables': {
     'chromium_code': 1,
   },
-  'conditions': [
-    ['not msvs_express', {
-      'targets': [
-        {
-          'target_name': 'static_initializers',
-          'type': 'executable',
-          'sources': [
-            'static_initializers.cc',
-          ],
-          'include_dirs': [
-            '$(VSInstallDir)/DIA SDK/include',
-          ],
-        },
+  'targets': [
+    {
+      'target_name': 'static_initializers',
+      'type': 'executable',
+      'sources': [
+        'static_initializers.cc',
       ],
-    }, {
-      'targets': [],
-    }],
-  ]
+      'include_dirs': [
+        '$(VSInstallDir)/DIA SDK/include',
+      ],
+    },
+  ],
 }
-