clang/win: Let remaining chromium_code targets build with -Wextra.

ui/gfx/platform_font_win_unittest.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 "ui/gfx/platform_font_win.h"
 
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 109 matching lines @@
     {base::ASCIIToUTF16("Tahoma"), 10},
     {base::ASCIIToUTF16("Tahoma"), 16},
     {base::ASCIIToUTF16("Segoe UI"), 6},
     {base::ASCIIToUTF16("Segoe UI"), 8},
     {base::ASCIIToUTF16("Segoe UI"), 20},
   };
 
   base::win::ScopedGetDC screen_dc(NULL);
   gfx::ScopedSetMapMode mode(screen_dc, MM_TEXT);
 
-  for (int i = 0; i < arraysize(fonts); ++i) {
+  for (const FontInfo& font : fonts) {
     LOGFONT font_info = {0};
 
-    font_info.lfHeight = -fonts[i].font_size;
+    font_info.lfHeight = -font.font_size;
     font_info.lfWeight = FW_NORMAL;
-    wcscpy_s(font_info.lfFaceName,
-             fonts[i].font_name.length() + 1,
-             fonts[i].font_name.c_str());
+    wcscpy_s(font_info.lfFaceName, font.font_name.length() + 1,
+             font.font_name.c_str());
 
-    HFONT font = CreateFontIndirect(&font_info);
+    HFONT hFont = CreateFontIndirect(&font_info);
 
     TEXTMETRIC font_metrics;
-    PlatformFontWin::GetTextMetricsForFont(screen_dc, font, &font_metrics);
+    PlatformFontWin::GetTextMetricsForFont(screen_dc, hFont, &font_metrics);
 
     scoped_refptr<PlatformFontWin::HFontRef> h_font_gdi(
-        PlatformFontWin::CreateHFontRefFromGDI(font, font_metrics));
+        PlatformFontWin::CreateHFontRefFromGDI(hFont, font_metrics));
 
     scoped_refptr<PlatformFontWin::HFontRef> h_font_skia(
-        PlatformFontWin::CreateHFontRefFromSkia(font, font_metrics));
+        PlatformFontWin::CreateHFontRefFromSkia(hFont, font_metrics));
 
     EXPECT_EQ(h_font_gdi->font_size(), h_font_skia->font_size());
     EXPECT_EQ(h_font_gdi->style(), h_font_skia->style());
     EXPECT_EQ(h_font_gdi->font_name(), h_font_skia->font_name());
     EXPECT_EQ(h_font_gdi->ave_char_width(), h_font_skia->ave_char_width());
 
     EXPECT_LE(abs(h_font_gdi->cap_height() - h_font_skia->cap_height()), 1);
     EXPECT_LE(abs(h_font_gdi->baseline() - h_font_skia->baseline()), 1);
     EXPECT_LE(abs(h_font_gdi->height() - h_font_skia->height()), 1);
   }
@@ skipping 19 matching lines @@
 
   FontInfo fonts[] = {
     {base::ASCIIToUTF16("MS Shell Dlg"), "Microsoft Sans Serif"},
     {base::ASCIIToUTF16("MS Shell Dlg 2"), "Tahoma"},
     {base::ASCIIToUTF16("FooBar"), "Arial"},
   };
 
   base::win::ScopedGetDC screen_dc(NULL);
   gfx::ScopedSetMapMode mode(screen_dc, MM_TEXT);
 
-  for (int i = 0; i < arraysize(fonts); ++i) {
+  for (const FontInfo& font : fonts) {
     LOGFONT font_info = {0};
 
     font_info.lfHeight = -10;
     font_info.lfWeight = FW_NORMAL;
-    wcscpy_s(font_info.lfFaceName,
-             fonts[i].font_name.length() + 1,
-             fonts[i].font_name.c_str());
+    wcscpy_s(font_info.lfFaceName, font.font_name.length() + 1,
+             font.font_name.c_str());
 
-    HFONT font = CreateFontIndirect(&font_info);
+    HFONT hFont = CreateFontIndirect(&font_info);
 
     TEXTMETRIC font_metrics;
-    PlatformFontWin::GetTextMetricsForFont(screen_dc, font, &font_metrics);
+    PlatformFontWin::GetTextMetricsForFont(screen_dc, hFont, &font_metrics);
 
     scoped_refptr<PlatformFontWin::HFontRef> h_font_skia(
-        PlatformFontWin::CreateHFontRefFromSkia(font, font_metrics));
+        PlatformFontWin::CreateHFontRefFromSkia(hFont, font_metrics));
 
-    EXPECT_EQ(fonts[i].expected_font_name, h_font_skia->font_name());
+    EXPECT_EQ(font.expected_font_name, h_font_skia->font_name());
   }
 }
 
 }  // namespace gfx