Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2398)

Unified Diff: chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win_unittest.cc

Issue 1513043002: clang/win: Let remaining chromium_code targets build with -Wextra. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win_unittest.cc
diff --git a/chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win_unittest.cc
index 8f79a697d786f44e46911bd40a47dfa2ef7615b1..62b74dbf7358f7314a8752b1df302d1fdd64da0c 100644
--- a/chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/module_integrity_verifier_win_unittest.cc
@@ -250,7 +250,7 @@ TEST_F(SafeBrowsingModuleVerifierWinTest,
&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(
@@ -299,7 +299,7 @@ TEST_F(SafeBrowsingModuleVerifierWinTest, DISABLED_VerifyModuleRelocOverlap) {
&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();
@@ -314,7 +314,8 @@ TEST_F(SafeBrowsingModuleVerifierWinTest, DISABLED_VerifyModuleRelocOverlap) {
// 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());
}

Powered by Google App Engine
This is Rietveld 408576698