Revert of win: Update to Win 10 SDK (patchset #7 id:120001 of https://codereview.chromium.org/1378153003/ )

Reason for revert:
Suspected of causing compile timeouts on Win builders.

e.g. http://build.chromium.org/p/chromium.win/builders/Win%20Builder/builds/14141

OTOH, all trybots were fine, I can't repro in a VM, and some of the compiles on waterfall are fine. So... needs some investigation.

Original issue's description:
> win: Update to Win 10 SDK
>
> Tested on clean Win7 VM against both VS2013 and clang=1 at 247874-1.
>
> NaCl roll has to be included here because clang-cl warns if _WIN32_WINNT differs when building NaCl in Chrome. Roll includes:
>
> 719fce7fa0..9c69f1fcb3
>
> d:\src\cr3\src>git log 719fce7fa0c1f11cf05d5c20cdfa6648e8a35611..9c69f1fcb35b34f136da7ea7c91ceb743b9d2aaa --pretty=oneline
> 9c69f1fcb35b34f136da7ea7c91ceb743b9d2aaa win: Update to Windows 10 SDK
> bc87a5bbc9664e22fcfe01786d501d70f198b22f Update revision for PNaCl
> 8d12493d902fec4c91dc949ab3a553c680b354a5 Use -fgnu-inline-asm for non-SFI IRT GYP build
> a27e828a3f1408197fbe39a5649e0b12f5b83e5d PNaCl: Update llvm and subzero revision in pnacl/COMPONENT_REVISIONS
> 11234b3082981faaf98b3045b907e19dd15b2737 Make ncval_annotate accept command-line options for paths.
> 0825b8b3e036f434375963458f090287e98be57f Fix failure of NaClHostDirOpen("/") on windows
> b73b0a27a2f833e7937c69dcbceda60cf522cd24 Add a test for x86-32 IRT stack realignment
> 67569a6bf3dfbdc8392e3aed95fcab4a3b49865b Add --finalize option to pnacl-ld
> 89c677938dec5ee5460c40731f5a4028c5c39527 Build non-SFI version of sandboxed binaries
> 9906fe25373ca728aed81a6a3e944a42c0603298 Remove per-file *.gn from OWNERS
> 564d7b6489425339c1a4d667874f51a3ce3d8b0f Add x86 and x64 into the list of supported PNaCl architectures
> ea4179990a6d0a3570ca53fcd6d898df6ef0a408 PNaCl: Remove the -allow-asm option
> 8a68b7b483492ebd918b7cbd315a3b7738b2efee PNaCl: Update llvm revision in pnacl/COMPONENT_REVISIONS
> 04d56826368fc7fcd5a802c1e3794c1abb4b3978 Build support for fnl.
> dafabd1973dad64651ab2ed93fabec9415843ff4 GN: Conditionalize x86-specific validator bits
> 9f06ea989d1257827a402be1b45cd0450296959a [Docs] Add wiki content to Markdown docs
> 644c971c7e492740d0fe0f997b9f5b01a23727fc PNaCl: Update subzero revision in pnacl/COMPONENT_REVISIONS
> 13f84b78ff6a702434b1501fc06643a4c1721998 debug_stub: Avoid unused const warning on non-x86 builds
>
> R=brucedawson@chromium.org
> BUG=491424
>
> Committed: https://crrev.com/3f6f89251dc210b24a36398237d374a87d4a3b33
> Cr-Commit-Position: refs/heads/master@{#352667}

TBR=brucedawson@chromium.org,sky@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=491424

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

Cr-Original-Commit-Position: refs/heads/master@{#352714}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 2adcdde0c31366f8b6a5a1f6deb301abbd92e91f

common.gypi

@@ -1501,7 +1501,7 @@
     'sas_dll_exists': '<!pymod_do_main(dir_exists "<(sas_dll_path)")',
     'wix_exists': '<!pymod_do_main(dir_exists "<(wix_path)")',
 
-    'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/10',
+    'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.1',
     'directx_sdk_default_path': '<(DEPTH)/third_party/directxsdk/files',
 
     # Whether we are using the rlz library or not.  Platforms like Android send
@@ -2867,9 +2867,9 @@
           '__STD_C',
           '_CRT_SECURE_NO_DEPRECATE',
           '_SCL_SECURE_NO_DEPRECATE',
-          # This define is required to pull in the new Win 10 interfaces from
+          # This define is required to pull in the new Win8 interfaces from
           # system headers like ShObjIdl.h.
-          'NTDDI_VERSION=0x0A000000',
+          'NTDDI_VERSION=0x06030000',
           # This is required for ATL to use XP-safe versions of its functions.
           '_USING_V110_SDK71_',
         ],
@@ -3339,17 +3339,17 @@
             'MinimumRequiredVersion': '5.02',  # Server 2003.
             'TargetMachine': '17', # x86 - 64
             'AdditionalLibraryDirectories!':
-              ['<(windows_sdk_path)/Lib/10.0.10240.0/um/x86'],
+              ['<(windows_sdk_path)/Lib/win8/um/x86'],
             'AdditionalLibraryDirectories':
-              ['<(windows_sdk_path)/Lib/10.0.10240.0/um/x64'],
+              ['<(windows_sdk_path)/Lib/win8/um/x64'],
             # Doesn't exist x64 SDK. Should use oleaut32 in any case.
             'IgnoreDefaultLibraryNames': [ 'olepro32.lib' ],
           },
           'VCLibrarianTool': {
             'AdditionalLibraryDirectories!':
-              ['<(windows_sdk_path)/Lib/10.0.10240.0/um/x86'],
+              ['<(windows_sdk_path)/Lib/win8/um/x86'],
             'AdditionalLibraryDirectories':
-              ['<(windows_sdk_path)/Lib/10.0.10240.0/um/x64'],
+              ['<(windows_sdk_path)/Lib/win8/um/x64'],
             'TargetMachine': '17', # x64
           },
         },
@@ -5481,8 +5481,8 @@
     ['OS=="win"', {
       'target_defaults': {
         'defines': [
-          '_WIN32_WINNT=0x0A00',
-          'WINVER=0x0A00',
+          '_WIN32_WINNT=0x0603',
+          'WINVER=0x0603',
           'WIN32',
           '_WINDOWS',
           'NOMINMAX',
@@ -5592,9 +5592,9 @@
           }],
         ],
         'msvs_system_include_dirs': [
-          '<(windows_sdk_path)/Include/10.0.10240.0/shared',
-          '<(windows_sdk_path)/Include/10.0.10240.0/um',
-          '<(windows_sdk_path)/Include/10.0.10240.0/winrt',
+          '<(windows_sdk_path)/Include/shared',
+          '<(windows_sdk_path)/Include/um',
+          '<(windows_sdk_path)/Include/winrt',
           '$(VSInstallDir)/VC/atlmfc/include',
         ],
         'msvs_cygwin_shell': 0,

config/win/BUILD.gn

@@ -98,7 +98,7 @@ config("runtime_library") {
     "_ATL_NO_OPENGL",
     "_WINDOWS",
     "CERT_CHAIN_PARA_HAS_EXTRA_FIELDS",
-    "NTDDI_VERSION=0x0A000000",
+    "NTDDI_VERSION=0x06030000",
     "PSAPI_VERSION=1",
     "WIN32",
     "_SECURE_ATL",
@@ -139,8 +139,8 @@ config("runtime_library") {
 # targets need to manually override it for their compiles.
 config("winver") {
   defines = [
-    "_WIN32_WINNT=0x0A00",
-    "WINVER=0x0A00",
+    "_WIN32_WINNT=0x0603",
+    "WINVER=0x0603",
   ]
 }
 

vs_toolchain.py

@@ -192,7 +192,7 @@ def _GetDesiredVsToolchainHashes():
     return ['49ae4b60d898182fc3f521c2fcda82c453915011']
   else:
     # Default to VS2013.
-    return ['9ff97c632ae1fee0c98bcd53e71770eb3a0d8deb']
+    return ['ee7d718ec60c2dc5d255bbe325909c2021a7efef']
 
 
 def Update(force=False):