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

chrome/installer/util/delete_after_reboot_helper_unittest.cc

 // Copyright (c) 2011 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 <windows.h>
 #include <shlobj.h>
 
 #include "base/files/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
@@ skipping 93 matching lines @@
     const wchar_t* test_name;
     const wchar_t* str;
     DWORD length;
     size_t count;
   } tests[] = {
     { L"basic", L"foo\0bar\0fee\0bee\0boo\0bong\0\0", 26 * sizeof(wchar_t), 3 },
     { L"empty", L"\0\0", 2 * sizeof(wchar_t), 1 },
     { L"deletes", L"foo\0\0bar\0\0bizz\0\0", 16 * sizeof(wchar_t), 3 },
   };
 
-  for (int i = 0; i < arraysize(tests); i++) {
+  for (size_t i = 0; i < arraysize(tests); i++) {
     std::vector<PendingMove> string_list;
     EXPECT_TRUE(SUCCEEDED(
         MultiSZBytesToStringArray(reinterpret_cast<const char*>(tests[i].str),
                                   tests[i].length,
                                   &string_list)))
         << tests[i].test_name;
     EXPECT_EQ(tests[i].count, string_list.size()) << tests[i].test_name;
     std::vector<char> buffer;
     buffer.resize(WStringPairListSize(string_list));
     StringArrayToMultiSZBytes(string_list, &buffer);
     EXPECT_TRUE(CompareBuffers(const_cast<const char*>(&buffer[0]),
                                reinterpret_cast<const char*>(tests[i].str),
                                tests[i].length))
         << tests[i].test_name;
   }
 
   StringTest failures[] = {
       {L"malformed", reinterpret_cast<const wchar_t*>("oddnumb\0\0"), 9, 1},
   };
 
-  for (int i = 0; i < arraysize(failures); i++) {
+  for (size_t i = 0; i < arraysize(failures); i++) {
     std::vector<PendingMove> string_list;
     EXPECT_FALSE(SUCCEEDED(MultiSZBytesToStringArray(
         reinterpret_cast<const char*>(failures[i].str),
         failures[i].length,
         &string_list)))
         << failures[i].test_name;
   }
 }
 
 
@@ skipping 18 matching lines @@
   std::vector<PendingMove>::const_iterator iter(pending_moves.begin());
   for (; iter != pending_moves.end(); iter++) {
     base::FilePath move_path(iter->first);
     if (MatchPendingDeletePath(short_temp_file, move_path))
       break;
   }
 
   // Check that each of the deletes we expect are there in order.
   base::FilePath expected_paths[] =
       { temp_file_, temp_subdir_file_, temp_subdir_, temp_dir_ };
-  for (int i = 0; i < arraysize(expected_paths); ++i) {
+  for (size_t i = 0; i < arraysize(expected_paths); ++i) {
     EXPECT_FALSE(iter == pending_moves.end());
     if (iter != pending_moves.end()) {
       base::FilePath short_path_name(GetShortPathName(expected_paths[i]));
       base::FilePath move_path(iter->first);
       EXPECT_TRUE(MatchPendingDeletePath(short_path_name, move_path));
       ++iter;
     }
   }
 
   // Test that we can remove the pending deletes.
@@ skipping 33 matching lines @@
   std::vector<PendingMove>::const_iterator iter(pending_moves.begin());
   for (; iter != pending_moves.end(); iter++) {
     base::FilePath move_path(iter->first);
     if (MatchPendingDeletePath(short_temp_file, move_path))
       break;
   }
 
   // Check that each of the deletes we expect are there in order.
   base::FilePath expected_paths[] =
       { temp_file_, temp_subdir_file_, temp_subdir_, temp_dir_ };
-  for (int i = 0; i < arraysize(expected_paths); ++i) {
+  for (size_t i = 0; i < arraysize(expected_paths); ++i) {
     EXPECT_FALSE(iter == pending_moves.end());
     if (iter != pending_moves.end()) {
       base::FilePath short_path_name(GetShortPathName(expected_paths[i]));
       base::FilePath move_path(iter->first);
       EXPECT_TRUE(MatchPendingDeletePath(short_path_name, move_path));
       ++iter;
     }
   }
 
   // Delete the temporary directory.
   base::DeleteFile(temp_dir_, true);
 
   // Test that we can remove the pending deletes.
   EXPECT_TRUE(RemoveFromMovesPendingReboot(temp_dir_));
   HRESULT hr = GetPendingMovesValue(&pending_moves);
   EXPECT_TRUE(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND));
 
   EXPECT_EQ(initial_pending_moves_size, pending_moves.size());
 
   std::vector<PendingMove>::const_iterator check_iter(pending_moves.begin());
   for (; check_iter != pending_moves.end(); ++check_iter) {
     base::FilePath move_path(check_iter->first);
     EXPECT_FALSE(MatchPendingDeletePath(short_temp_file, move_path));
   }
 }