| Index: build/config/win/BUILD.gn
 | 
| diff --git a/build/config/win/BUILD.gn b/build/config/win/BUILD.gn
 | 
| index ebcbb10ce742238d4b8af82b28af907a73536934..4dd71d7c4945fbf4d0d686cb17e2aa1b529d3ba1 100644
 | 
| --- a/build/config/win/BUILD.gn
 | 
| +++ b/build/config/win/BUILD.gn
 | 
| @@ -5,7 +5,6 @@
 | 
|  import("//build/config/clang/clang.gni")
 | 
|  import("//build/config/compiler/compiler.gni")
 | 
|  import("//build/config/sanitizers/sanitizers.gni")
 | 
| -import("//build/config/win/visual_studio_version.gni")
 | 
|  import("//build/toolchain/toolchain.gni")
 | 
|  
 | 
|  assert(is_win)
 | 
| @@ -48,36 +47,24 @@ config("compiler") {
 | 
|    cflags_c = [ "/TC" ]
 | 
|    cflags_cc = [ "/TP" ]
 | 
|  
 | 
| -  # Flags not supported in version 2013.
 | 
| -  if (visual_studio_version != "2013" && visual_studio_version != "2013e") {
 | 
| -    cflags += [
 | 
| -      # Tell the compiler to crash on failures. This is undocumented
 | 
| -      # and unsupported but very handy.
 | 
| -      "/d2FastFail",
 | 
| -    ]
 | 
| -  }
 | 
| +  cflags += [
 | 
| +    # Tell the compiler to crash on failures. This is undocumented
 | 
| +    # and unsupported but very handy.
 | 
| +    "/d2FastFail",
 | 
|  
 | 
| -  if (visual_studio_version == "2015") {
 | 
| -    cflags += [
 | 
| -      # Work around crbug.com/526851, bug in VS 2015 RTM compiler.
 | 
| -      "/Zc:sizedDealloc-",
 | 
| +    # Work around crbug.com/526851, bug in VS 2015 RTM compiler.
 | 
| +    "/Zc:sizedDealloc-",
 | 
|  
 | 
| -      # Disable thread-safe statics to avoid overhead and because
 | 
| -      # they are disabled on other platforms. See crbug.com/587210
 | 
| -      # and -fno-threadsafe-statics.
 | 
| -      "/Zc:threadSafeInit-",
 | 
| -    ]
 | 
| -  }
 | 
| +    # Disable thread-safe statics to avoid overhead and because
 | 
| +    # they are disabled on other platforms. See crbug.com/587210
 | 
| +    # and -fno-threadsafe-statics.
 | 
| +    "/Zc:threadSafeInit-",
 | 
| +  ]
 | 
|  
 | 
|    # Building with Clang on Windows is a work in progress and very
 | 
|    # experimental. See crbug.com/82385.
 | 
| -  # Keep this in sync with the similar block in build/common.gypi
 | 
|    if (is_clang) {
 | 
| -    if (visual_studio_version == "2013") {
 | 
| -      cflags += [ "-fmsc-version=1800" ]
 | 
| -    } else if (visual_studio_version == "2015") {
 | 
| -      cflags += [ "-fmsc-version=1900" ]
 | 
| -    }
 | 
| +    cflags += [ "-fmsc-version=1900" ]
 | 
|  
 | 
|      if (current_cpu == "x86") {
 | 
|        cflags += [ "-m32" ]
 | 
| 
 |