Revert 271737 "Revert 271721 "VS2013 Update 2""

https://src.chromium.org/viewvc/chrome?view=rev&revision=271919 fixes the
compiler crash, http://src.chromium.org/viewvc/chrome?view=rev&revision=271780
fixes the bug in landmines that didn't allow the initial land/revert to
go smoothly.

Should be A-OK this time.

> Revert 271721 "VS2013 Update 2"
> 
> static_library build ICEing on some builders on mini_installer.
> 
> > VS2013 Update 2
> > 
> > As discussed in the linked bug, the toolchain2013.py script in
> > depot_tools is no longer workable (because the update for Update 2 is
> > supplied as a .msp that must be applied against a system-installed
> > VS2013).
> > 
> > As such, the Express hash here is not updated.
> > 
> > The hash zip referenced here was built as follows:
> > - Install VS2013 Update 2 on a clean VM
> > - Copy DIA SDK\, VC\
> > - Copy DLLs from VC\redist to sys32\ and sys64\
> > - Copy win8sdk unchanged from previous .zip.
> > - Delete various unused arm\ subdirectories
> > - Delete the IDE-only Snippets, etc. subdirectories in VC\
> > - Patch VC\include\xtree to disable warning 4702 per request in
> >   http://crbug.com/346399 .
> > 
> > A followup change will be to write a script that does these steps
> > semi-automatically, hopefully for Express too, though there is the
> > added complication of the WDK/ATL/MFC hacking required there. In
> > particular, this script will not be useful for a dev to actually run
> > as part of runhooks, but will be a bit useful for deployment/
> > documentation of the above process.
> > 
> > In the interim there are no extremely-pressing reasons for Express
> > users to update to Update2 that I'm aware of, so they get non-Update2
> > for now.
> > 
> > R=iannucci@chromium.org
> > BUG=372451,346399,371847,339215,350639
> > 
> > Review URL: https://codereview.chromium.org/284663003
> 
> TBR=scottmg@chromium.org
> 
> Review URL: https://codereview.chromium.org/297753002

TBR=scottmg@chromium.org

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

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

apps/shell/app_shell.gyp

@@ -175,7 +175,6 @@
               'SubSystem': '2',  # Set /SUBSYSTEM:WINDOWS
             },
           },
-          'msvs_large_pdb': 1,
           'dependencies': [
             '<(DEPTH)/sandbox/sandbox.gyp:sandbox',
           ],
@@ -197,7 +196,6 @@
       'defines': [
         'HAS_OUT_OF_PROC_TEST_RUNNER',
       ],
-      'msvs_large_pdb': 1,
       'sources': [
         # TODO(yoz): Refactor once we have a second test target.
         'browser/shell_browsertest.cc',

build/get_landmines.py

@@ -48,6 +48,7 @@ def print_landmines(target):
   if (platform() == 'win' and builder() == 'ninja' and
       gyp_msvs_version().startswith('2013')):
     print "Switched win from VS2010 to VS2013."
+    print "Update to VS2013 Update 2."
   print 'Need to clobber everything due to an IDL change in r154579 (blink)'
   if (platform() != 'ios'):
     print 'Clobber to get rid of obselete test plugin after r248358'

build/toolchain_vs2013.hash

-ca6a9996a6f769d9435067367707fd85ec205d67
+27eac9b2869ef6c89391f305a3f01285ea317867
 9d9a93134b3eabd003b85b4e7dea06c0eae150ed

chrome/chrome_dll.gypi

@@ -108,7 +108,6 @@
               'dependencies': [
                 # On Windows, link the dependencies (libraries) that make
                 # up actual Chromium functionality into this .dll.
-                'chrome_dll_pdb_workaround',
                 'chrome_version_resources',
                 '../chrome/chrome_resources.gyp:chrome_unscaled_resources',
                 '../crypto/crypto.gyp:crypto',
@@ -328,29 +327,6 @@
         },  # target chrome_main_dll
       ],  # targets
     }],  # OS=="mac" or OS=="win"
-    ['OS=="win"', {
-      'targets': [
-        {
-          # This target is only depended upon on Windows.
-          'target_name': 'chrome_dll_pdb_workaround',
-          'type': 'static_library',
-          'sources': [ 'empty_pdb_workaround.cc' ],
-          'conditions': [
-            ['fastbuild==0 or win_z7!=0', {
-             'msvs_settings': {
-              'VCCLCompilerTool': {
-                # This *in the compile phase* must match the pdb name that's
-                # output by the final link. See empty_pdb_workaround.cc for
-                # more details.
-                'DebugInformationFormat': '3',
-                'ProgramDataBaseFileName': '<(PRODUCT_DIR)/chrome.dll.pdb',
-              },
-             },
-            }],
-          ],
-        },
-      ],
-    }],
     ['chrome_multiple_dll', {
       'targets': [
         {

chrome/chrome_tests.gypi

@@ -307,7 +307,6 @@
           ],
         }],
         ['OS=="win"', {
-          'msvs_large_pdb': 1,
           'include_dirs': [
             '../third_party/wtl/include',
           ],
@@ -1789,7 +1788,6 @@
             '<(DEPTH)/third_party/wtl/include',
           ],
           'dependencies': [
-            'browser_tests_exe_pdb_workaround',
             'chrome_version_resources',
             'security_tests',  # run time dependency
           ],
@@ -2108,7 +2106,6 @@
           'dependencies': [
             'chrome_version_resources',
           ],
-          'msvs_large_pdb': 1,
           'conditions': [
             ['win_use_allocator_shim==1', {
               'dependencies': [
@@ -2383,7 +2380,6 @@
           ],
         }],
         ['OS=="win"', {
-          'msvs_large_pdb': 1,
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc',
@@ -2489,7 +2485,6 @@
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
           ],
-          'msvs_large_pdb': 1,
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
           ],
@@ -2944,25 +2939,6 @@
         },
       ],
     }],
-    ['OS=="win"', {
-      'targets' : [
-        {
-          # This target is only depended upon in Windows.
-          'target_name': 'browser_tests_exe_pdb_workaround',
-          'type': 'static_library',
-          'sources': [ 'empty_pdb_workaround.cc' ],
-          'msvs_settings': {
-            'VCCLCompilerTool': {
-              # This *in the compile phase* must match the pdb name that's
-              # output by the final link. See empty_pdb_workaround.cc for
-              # more details.
-              'DebugInformationFormat': '3',
-              'ProgramDataBaseFileName': '<(PRODUCT_DIR)/browser_tests.exe.pdb',
-            },
-          },
-        },
-      ],
-    }],
     [ 'enable_mdns == 1', {
       'targets': [{
           'target_name': 'service_discovery_sniffer',

chrome/chrome_tests_unit.gypi

@@ -2425,7 +2425,6 @@
           'dependencies': [
             'chrome_version_resources',
             'installer_util_strings',
-            'unit_tests_exe_pdb_workaround',
             '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
             '../third_party/isimpledom/isimpledom.gyp:isimpledom',
           ],
@@ -2823,24 +2822,5 @@
         },
       ],
     }],
-    ['OS=="win"', {
-      'targets' : [
-        {
-          # This target is only depended upon on Windows.
-          'target_name': 'unit_tests_exe_pdb_workaround',
-          'type': 'static_library',
-          'sources': [ 'empty_pdb_workaround.cc' ],
-          'msvs_settings': {
-            'VCCLCompilerTool': {
-              # This *in the compile phase* must match the pdb name that's
-              # output by the final link. See empty_pdb_workaround.cc for
-              # more details.
-              'DebugInformationFormat': '3',
-              'ProgramDataBaseFileName': '<(PRODUCT_DIR)/unit_tests.exe.pdb',
-            },
-          },
-        },
-      ],
-    }],
   ],  # 'conditions'
 }

chrome/empty_pdb_workaround.cc

-// Copyright 2013 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.
-
-// This file is used to generate an empty .pdb -- with a 4K pagesize -- that we
-// then use during the final link for chrome.dll's pdb. Otherwise, the linker
-// will generate a pdb with a page size of 1K, which imposes a limit of 1G on
-// the .pdb which we exceed. By generating a .pdb with the compiler (rather
-// than the linker), this limit is avoided.

content/content_shell.gypi

@@ -541,7 +541,6 @@
               },
             },
           },
-          'msvs_large_pdb': 1,
         }],  # OS=="win"
         ['OS == "win"', {
           'dependencies': [