Update from chromium https://crrev.com/301315

base/win/win_util.cc

 // Copyright (c) 2012 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.
 
 #include "base/win/win_util.h"
 
 #include <aclapi.h>
 #include <cfgmgr32.h>
 #include <lm.h>
 #include <powrprof.h>
@@ skipping 101 matching lines @@
   return keyboard_count > 1;
 }
 
 }  // namespace
 
 namespace base {
 namespace win {
 
 static bool g_crash_on_process_detach = false;
 
-#define NONCLIENTMETRICS_SIZE_PRE_VISTA \
-    SIZEOF_STRUCT_WITH_SPECIFIED_LAST_MEMBER(NONCLIENTMETRICS, lfMessageFont)
-
-void GetNonClientMetrics(NONCLIENTMETRICS* metrics) {
+void GetNonClientMetrics(NONCLIENTMETRICS_XP* metrics) {
   DCHECK(metrics);
-
-  static const UINT SIZEOF_NONCLIENTMETRICS =
-      (base::win::GetVersion() >= base::win::VERSION_VISTA) ?
-      sizeof(NONCLIENTMETRICS) : NONCLIENTMETRICS_SIZE_PRE_VISTA;
-  metrics->cbSize = SIZEOF_NONCLIENTMETRICS;
-  const bool success = !!SystemParametersInfo(SPI_GETNONCLIENTMETRICS,
-                                              SIZEOF_NONCLIENTMETRICS, metrics,
-                                              0);
+  metrics->cbSize = sizeof(*metrics);
+  const bool success = !!SystemParametersInfo(
+      SPI_GETNONCLIENTMETRICS,
+      metrics->cbSize,
+      reinterpret_cast<NONCLIENTMETRICS*>(metrics),
+      0);
   DCHECK(success);
 }
 
 bool GetUserSidString(std::wstring* user_sid) {
   // Get the current token.
   HANDLE token = NULL;
   if (!::OpenProcessToken(::GetCurrentProcess(), TOKEN_QUERY, &token))
     return false;
   base::win::ScopedHandle token_scoped(token);
 
@@ skipping 327 matching lines @@
 #if defined(_MSC_FULL_VER)
   #pragma message(__PPOUT__(_MSC_FULL_VER))
 #endif
 
 #pragma message("Visual Studio 2012 x86 must be updated to at least Update 1")
 #error Must install Update 1 to Visual Studio 2012.
 #endif
 
 #endif  // _MSC_VER