Fix more Windows compile errors

base/win/win_util.h

 // 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.
 
 // =============================================================================
 // PLEASE READ
 //
 // In general, you should not be adding stuff to this file.
 //
 // - If your thing is only used in one place, just put it in a reasonable
@@ skipping 15 matching lines @@
 
 #include <string>
 
 #include "base/base_export.h"
 #include "base/strings/string16.h"
 
 struct IPropertyStore;
 struct _tagpropertykey;
 typedef _tagpropertykey PROPERTYKEY;
 
-// This is the same as NONCLIENTMETRICS except that the
-// unused member |iPaddedBorderWidth| has been removed.
-struct NONCLIENTMETRICS_XP {
-    UINT    cbSize;
-    int     iBorderWidth;
-    int     iScrollWidth;
-    int     iScrollHeight;
-    int     iCaptionWidth;
-    int     iCaptionHeight;
-    LOGFONTW lfCaptionFont;
-    int     iSmCaptionWidth;
-    int     iSmCaptionHeight;
-    LOGFONTW lfSmCaptionFont;
-    int     iMenuWidth;
-    int     iMenuHeight;
-    LOGFONTW lfMenuFont;
-    LOGFONTW lfStatusFont;
-    LOGFONTW lfMessageFont;
-};
-
 namespace base {
 namespace win {
 
-BASE_EXPORT void GetNonClientMetrics(NONCLIENTMETRICS_XP* metrics);
+BASE_EXPORT void GetNonClientMetrics(NONCLIENTMETRICS* metrics);
 
 // Returns the string representing the current user sid.
 BASE_EXPORT bool GetUserSidString(std::wstring* user_sid);
 
 // Returns true if the shift key is currently pressed.
 BASE_EXPORT bool IsShiftPressed();
 
 // Returns true if the ctrl key is currently pressed.
 BASE_EXPORT bool IsCtrlPressed();
 
@@ skipping 88 matching lines @@
 // certificates. As its name indicates, this function provides a best-effort
 // answer, which is solely based on comparing version numbers. The function
 // may be re-implemented in the future to return a reliable value, based on
 // run-time detection of this capability.
 BASE_EXPORT bool MaybeHasSHA256Support();
 
 }  // namespace win
 }  // namespace base
 
 #endif  // BASE_WIN_WIN_UTIL_H_