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

Reason for revert:
This breaks GPU win debug bots (https://build.chromium.org/p/chromium.gpu/builders/Win7%20Debug%20%28NVIDIA%29/builds/36633 for example, every GPU test is crashing)

Original issue's description:
> 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
>
> Committed: https://crrev.com/20e99ecb08da22582d435c1a5bba0a5c96345da3
> Cr-Commit-Position: refs/heads/master@{#374058}

TBR=dpranke@chromium.org,scottmg@chromium.org,sebmarchand@chromium.org,thakis@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

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

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

1 files changed, 3 insertions, 5 deletions

diff --git a/build/vs_toolchain.py b/build/vs_toolchain.py
index bb3e853..f6aef3a 100755
--- a/build/vs_toolchain.py
+++ b/build/vs_toolchain.py
@@ -21,8 +21,8 @@ json_data_file = os.path.join(script_dir, 'win_toolchain.json')
 import gyp
 
 
-# Use MSVS2015 as the default toolchain.
-CURRENT_DEFAULT_TOOLCHAIN_VERSION = '2015'
+# Use MSVS2013 as the default toolchain.
+CURRENT_DEFAULT_TOOLCHAIN_VERSION = '2013'
 
 
 def SetEnvironmentAndGetRuntimeDllDirs():
@@ -274,6 +274,7 @@ def _GetDesiredVsToolchainHashes():
     # Update 1 with Debuggers, UCRT installers and ucrtbased.dll
     return ['523b6c2d3df300b2c8538cdc0beac404726af051']
   else:
+    # Default to VS2013.
     return ['4087e065abebdca6dbd0caca2910c6718d2ec67f']
 
 
@@ -307,9 +308,6 @@ 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,