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

chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win_unittest.cc

 // Copyright 2014 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 "chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win.h"
 
 #include <algorithm>
 #include <functional>
 #include <map>
 #include <vector>
@@ skipping 232 matching lines @@
 
   uint8_t* mem_code_addr = NULL;
   uint8_t* disk_code_addr = NULL;
   uint32_t code_size = 0;
   ASSERT_TRUE(GetCodeAddrsAndSize(*mem_peimage_ptr_,
                                   *disk_peimage_ptr_,
                                   &mem_code_addr,
                                   &disk_code_addr,
                                   &code_size));
 
-  const size_t kModificationSize = 256;
+  const int kModificationSize = 256;
   // Write the modification at the end so it's not overlapping relocations
   const size_t modification_offset = code_size - kModificationSize;
   ScopedModuleModifier<kModificationSize> mod(
       mem_code_addr + modification_offset);
 
   state.Clear();
   num_bytes_different = 0;
   ASSERT_TRUE(VerifyModule(kTestDllNames[0], &state, &num_bytes_different));
   ASSERT_TRUE(state.has_name());
   ASSERT_EQ(base::WideToUTF8(kTestDllNames[0]), state.name());
@@ skipping 28 matching lines @@
   uint8_t* mem_code_addr = NULL;
   uint8_t* disk_code_addr = NULL;
   uint32_t code_size = 0;
   ASSERT_TRUE(GetCodeAddrsAndSize(*mem_peimage_ptr_,
                                   *disk_peimage_ptr_,
                                   &mem_code_addr,
                                   &disk_code_addr,
                                   &code_size));
 
   // Modify the first hunk of the code, which contains many relocs.
-  const size_t kModificationSize = 256;
+  const int kModificationSize = 256;
   ScopedModuleModifier<kModificationSize> mod(mem_code_addr);
 
   state.Clear();
   num_bytes_different = 0;
   ASSERT_TRUE(VerifyModule(kTestDllNames[0], &state, &num_bytes_different));
   ASSERT_TRUE(state.has_name());
   ASSERT_EQ(base::WideToUTF8(kTestDllNames[0]), state.name());
   ASSERT_TRUE(state.has_modified_state());
   ASSERT_EQ(ModuleState::MODULE_STATE_MODIFIED, state.modified_state());
   ASSERT_EQ(kModificationSize, num_bytes_different);
 
   // Modifications across the relocs should have been coalesced into one.
   ASSERT_EQ(1, state.modification_size());
   ASSERT_EQ(kModificationSize, state.modification(0).byte_count());
-  ASSERT_EQ(kModificationSize, state.modification(0).modified_bytes().size());
+  ASSERT_EQ(static_cast<size_t>(kModificationSize),
+            state.modification(0).modified_bytes().size());
   EXPECT_EQ(std::string(mem_code_addr, mem_code_addr + kModificationSize),
             state.modification(0).modified_bytes());
 }
 
 TEST_F(SafeBrowsingModuleVerifierWinTest, VerifyModuleExportModified) {
   ModuleState state;
   int num_bytes_different = 0;
   // Confirm the module is identical in memory as on disk before we begin.
   SetUpTestDllAndPEImages();
   ASSERT_TRUE(VerifyModule(kTestDllNames[0], &state, &num_bytes_different));
@@ skipping 59 matching lines @@
 
   // One of the two exports now has two modifications.
   BuildModificationMap(state, &modification_map);
   ASSERT_EQ(2U, modification_map.size());
   ASSERT_EQ(3U, (modification_map.begin()->second.size() +
                  (++modification_map.begin())->second.size()));
 }
 #endif  // ADDRESS_SANITIZER
 
 }  // namespace safe_browsing