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

chrome/installer/util/master_preferences_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.
 //
 // Unit tests for master preferences related methods.
 
 #include "base/files/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
@@ skipping 83 matching lines @@
       installer::master_preferences::kDoNotCreateTaskbarShortcut,
       installer::master_preferences::kDoNotLaunchChrome,
       installer::master_preferences::kMakeChromeDefault,
       installer::master_preferences::kMakeChromeDefaultForUser,
       installer::master_preferences::kSystemLevel,
       installer::master_preferences::kVerboseLogging,
       installer::master_preferences::kRequireEula,
       installer::master_preferences::kAltShortcutText,
   };
 
-  for (int i = 0; i < arraysize(expected_true); ++i) {
+  for (size_t i = 0; i < arraysize(expected_true); ++i) {
     bool value = false;
     EXPECT_TRUE(prefs.GetBool(expected_true[i], &value));
     EXPECT_TRUE(value) << expected_true[i];
   }
 
   std::string str_value;
   EXPECT_TRUE(prefs.GetString(
       installer::master_preferences::kDistroImportBookmarksFromFilePref,
       &str_value));
   EXPECT_STREQ("c:\\foo", str_value.c_str());
@@ skipping 30 matching lines @@
 
   ExpectedBooleans expected_bool[] = {
     { installer::master_preferences::kDistroImportSearchPref, true },
     { installer::master_preferences::kDistroImportBookmarksPref, false },
     { installer::master_preferences::kDoNotCreateDesktopShortcut, true },
     { installer::master_preferences::kDoNotCreateQuickLaunchShortcut, true },
     { installer::master_preferences::kDoNotLaunchChrome, true },
   };
 
   bool value = false;
-  for (int i = 0; i < arraysize(expected_bool); ++i) {
+  for (size_t i = 0; i < arraysize(expected_bool); ++i) {
     EXPECT_TRUE(prefs.GetBool(expected_bool[i].name, &value));
     EXPECT_EQ(value, expected_bool[i].expected_value) << expected_bool[i].name;
   }
 
   const char* const missing_bools[] = {
     installer::master_preferences::kDistroImportHomePagePref,
     installer::master_preferences::kDistroWelcomePageOnOSUpgradeEnabled,
     installer::master_preferences::kDoNotRegisterForUpdateLaunch,
     installer::master_preferences::kMakeChromeDefault,
     installer::master_preferences::kMakeChromeDefaultForUser,
   };
 
-  for (int i = 0; i < arraysize(missing_bools); ++i) {
+  for (size_t i = 0; i < arraysize(missing_bools); ++i) {
     EXPECT_FALSE(prefs.GetBool(missing_bools[i], &value)) << missing_bools[i];
   }
 
   std::string str_value;
   EXPECT_FALSE(prefs.GetString(
       installer::master_preferences::kDistroImportBookmarksFromFilePref,
       &str_value));
 
   int icon_index = 0;
   EXPECT_FALSE(prefs.GetInt(
@@ skipping 18 matching lines @@
     "     \"https://google.com/f2\",\n"
     "     \"new_tab_page\"\n"
     "  ]\n"
     "} \n";
 
   EXPECT_TRUE(base::WriteFile(prefs_file(), text,
                               static_cast<int>(strlen(text))));
   installer::MasterPreferences prefs(prefs_file());
   typedef std::vector<std::string> TabsVector;
   TabsVector tabs = prefs.GetFirstRunTabs();
-  ASSERT_EQ(3, tabs.size());
+  ASSERT_EQ(3u, tabs.size());
   EXPECT_EQ("http://google.com/f1", tabs[0]);
   EXPECT_EQ("https://google.com/f2", tabs[1]);
   EXPECT_EQ("new_tab_page", tabs[2]);
 }
 
 // In this test instead of using our synthetic json file, we use an
 // actual test case from the extensions unittest. The hope here is that if
 // they change something in the manifest this test will break, but in
 // general it is expected the extension format to be backwards compatible.
 TEST(MasterPrefsExtension, ValidateExtensionJSON) {
@@ skipping 52 matching lines @@
 
   // Check prefs that do not have any equivalent command line option.
   ExpectedBooleans expected_bool[] = {
     { installer::master_preferences::kDoNotLaunchChrome, true },
     { installer::master_preferences::kSystemLevel, true },
     { installer::master_preferences::kVerboseLogging, false },
   };
 
   // Now check that prefs got merged correctly.
   bool value = false;
-  for (int i = 0; i < arraysize(expected_bool); ++i) {
+  for (size_t i = 0; i < arraysize(expected_bool); ++i) {
     EXPECT_TRUE(prefs.GetBool(expected_bool[i].name, &value));
     EXPECT_EQ(value, expected_bool[i].expected_value) << expected_bool[i].name;
   }
 
   // Delete temporary prefs file.
   EXPECT_TRUE(base::DeleteFile(prefs_file, false));
 
   // Check that if master prefs doesn't exist, we can still parse the common
   // prefs.
   cmd_str = L"setup.exe --do-not-launch-chrome";
   cmd_line.ParseFromString(cmd_str);
   installer::MasterPreferences prefs2(cmd_line);
   ExpectedBooleans expected_bool2[] = {
     { installer::master_preferences::kDoNotLaunchChrome, true },
   };
 
-  for (int i = 0; i < arraysize(expected_bool2); ++i) {
+  for (size_t i = 0; i < arraysize(expected_bool2); ++i) {
     EXPECT_TRUE(prefs2.GetBool(expected_bool2[i].name, &value));
     EXPECT_EQ(value, expected_bool2[i].expected_value)
         << expected_bool2[i].name;
   }
 
   EXPECT_FALSE(prefs2.GetBool(
       installer::master_preferences::kSystemLevel, &value));
   EXPECT_FALSE(prefs2.GetBool(
       installer::master_preferences::kVerboseLogging, &value));
 }
@@ skipping 103 matching lines @@
     prefs.GetBool(
         installer::master_preferences::kDoNotCreateQuickLaunchShortcut,
         &do_not_create_quick_launch_shortcut);
     prefs.GetBool(
         installer::master_preferences::kDoNotCreateTaskbarShortcut,
         &do_not_create_taskbar_shortcut);
     EXPECT_FALSE(do_not_create_desktop_shortcut);
     EXPECT_FALSE(do_not_create_quick_launch_shortcut);
     EXPECT_FALSE(do_not_create_taskbar_shortcut);
 }