Reland of Change default Windows compiler to VS 2015 (patchset #1 id:1 of https://codereview.chromium.org/1678663002/ )

Reason for revert:
Issues that forced revert of VS 2015 as default compiler are believed to be fixed.

Original issue's description:
> Revert of Change default Windows compiler to VS 2015 (patchset #10 id:180001 of https://codereview.chromium.org/1598493004/ )
>
> Reason for revert:
> Speculative for https://code.google.com/p/chromium/issues/detail?id=498544#c20 . Will reland if this doesn't help.
>
> Original issue's description:
> > Change default Windows compiler to VS 2015
> >
> > The change to get_landmines.py is there because modifying this file
> > affects analyze behavior so that all tests run. Changing the printed
> > message is purely a side effect.
> >
> > This change also removes some redundant INCLUDE paths. These are
> > unnecessary when building with VS 2015 (because it defaults to the
> > Windows 10 SDK) and actively harmful (they make the INCLUDE path
> > problematically long).
> >
> > BUG=440500,584782
> >
> > Committed: https://crrev.com/4c17ac0db59d7dbe78734950f83912ab564bd6fe
> > Cr-Commit-Position: refs/heads/master@{#373955}
>
> TBR=dpranke@chromium.org,scottmg@chromium.org,sebmarchand@chromium.org,brucedawson@chromium.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=440500,584782
>
> Committed: https://crrev.com/bbc766aef1bd8cb0d9546fec9abf264e7d8c1d96
> Cr-Commit-Position: refs/heads/master@{#374013}

TBR=dpranke@chromium.org,scottmg@chromium.org,sebmarchand@chromium.org,thakis@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=440500,584782

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

Cr-Original-Commit-Position: refs/heads/master@{#374058}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 20e99ecb08da22582d435c1a5bba0a5c96345da3

common.gypi

@@ -5670,11 +5670,13 @@
             ],
           }],
         ],
+        # Add extra include directories here that need to be in front of the
+        # installed and packaged include directories. This may be needed in
+        # order to force a particular SDK version, such as to get VS 2013 to use
+        # the Windows 10 SDK. Beware of making the INCLUDE variable excessively
+        # long, and be sure to make corresponding changes to
+        # build\toolchain\win\setup_toolchain.py
         'msvs_system_include_dirs': [
-          '<(windows_sdk_path)/Include/10.0.10586.0/shared',
-          '<(windows_sdk_path)/Include/10.0.10586.0/um',
-          '<(windows_sdk_path)/Include/10.0.10586.0/winrt',
-          '$(VSInstallDir)/VC/atlmfc/include',
         ],
         'msvs_cygwin_shell': 0,
         'msvs_disabled_warnings': [

get_landmines.py

@@ -52,9 +52,7 @@ def print_landmines():
     print "Switched win x64 trybots from VS2010 to VS2012."
   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 "Update to VS2013 Update 4."
+    print "Switch to VS2013"
   if (platform() == 'win' and gyp_msvs_version().startswith('2015')):
     print 'Switch to VS2015'
   print 'Need to clobber everything due to an IDL change in r154579 (blink)'

toolchain/win/setup_toolchain.py

@@ -150,18 +150,16 @@ def main():
           vc_bin_dir = os.path.realpath(path)
           break
 
-    # The Windows SDK include directories must be first. They both have a sal.h,
-    # and the SDK one is newer and the SDK uses some newer features from it not
-    # present in the Visual Studio one.
-    # Having the Windows SDK first is also the only way to control which SDK
-    # version is used.
-
-    if win_sdk_path:
-      additional_includes = ('{sdk_dir}\\Include\\10.0.10586.0\\shared;' +
-                             '{sdk_dir}\\Include\\10.0.10586.0\\um;' +
-                             '{sdk_dir}\\Include\\10.0.10586.0\\winrt;').format(
-                                  sdk_dir=win_sdk_path)
-      env['INCLUDE'] = additional_includes + env['INCLUDE']
+    # Add extra include directories here that need to be in front of the
+    # installed and packaged include directories. This may be needed in
+    # order to force a particular SDK version, such as to get VS 2013 to use
+    # the Windows 10 SDK. Beware of making the INCLUDE variable excessively
+    # long and be sure to make corresponding changes to build\common.gypi.
+    # Not currently used.
+    #if win_sdk_path:
+    #  additional_includes = ('{sdk_dir}\\Include\\10.0.10586.0\\um;').format(
+    #                              sdk_dir=win_sdk_path)
+    #  env['INCLUDE'] = additional_includes + env['INCLUDE']
     env_block = _FormatAsEnvironmentBlock(env)
     with open('environment.' + cpu, 'wb') as f:
       f.write(env_block)

vs_toolchain.py

@@ -21,8 +21,8 @@ json_data_file = os.path.join(script_dir, 'win_toolchain.json')
 import gyp
 
 
-# Use MSVS2013 as the default toolchain.
-CURRENT_DEFAULT_TOOLCHAIN_VERSION = '2013'
+# Use MSVS2015 as the default toolchain.
+CURRENT_DEFAULT_TOOLCHAIN_VERSION = '2015'
 
 
 def SetEnvironmentAndGetRuntimeDllDirs():
@@ -274,7 +274,6 @@ def _GetDesiredVsToolchainHashes():
     # Update 1 with Debuggers, UCRT installers and ucrtbased.dll
     return ['523b6c2d3df300b2c8538cdc0beac404726af051']
   else:
-    # Default to VS2013.
     return ['4087e065abebdca6dbd0caca2910c6718d2ec67f']
 
 
@@ -308,6 +307,9 @@ def Update(force=False):
         depot_tools_win_toolchain):
     import find_depot_tools
     depot_tools_path = find_depot_tools.add_depot_tools_to_path()
+    # Necessary so that get_toolchain_if_necessary.py will put the VS toolkit
+    # in the correct directory.
+    os.environ['GYP_MSVS_VERSION'] = GetVisualStudioVersion()
     get_toolchain_args = [
         sys.executable,
         os.path.join(depot_tools_path,