summaryrefslogtreecommitdiffstats
path: root/chrome_elf
diff options
context:
space:
mode:
Diffstat (limited to 'chrome_elf')
-rw-r--r--chrome_elf/blacklist/test/blacklist_test.cc6
-rw-r--r--chrome_elf/elf_imports_unittest.cc4
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome_elf/blacklist/test/blacklist_test.cc b/chrome_elf/blacklist/test/blacklist_test.cc
index 09d6a73..44f7aaf 100644
--- a/chrome_elf/blacklist/test/blacklist_test.cc
+++ b/chrome_elf/blacklist/test/blacklist_test.cc
@@ -65,7 +65,7 @@ class BlacklistTest : public testing::Test {
base::FilePath current_dir;
ASSERT_TRUE(PathService::Get(base::DIR_EXE, &current_dir));
- for (int i = 0; i < arraysize(test_data); ++i) {
+ for (size_t i = 0; i < arraysize(test_data); ++i) {
// Ensure that the dll has not been loaded both by inspecting the handle
// returned by LoadLibrary and by looking for an environment variable that
// is set when the DLL's entry point is called.
@@ -233,7 +233,7 @@ TEST_F(BlacklistTest, LoadBlacklistedLibrary) {
EXPECT_EQ(num_initially_blocked_, num_blocked_dlls);
// Add all DLLs to the blacklist then check they are blocked.
- for (int i = 0; i < arraysize(test_data); ++i) {
+ for (size_t i = 0; i < arraysize(test_data); ++i) {
EXPECT_TRUE(TestDll_AddDllToBlacklist(test_data[i].dll_name));
}
CheckBlacklistedDllsNotLoaded();
@@ -254,7 +254,7 @@ TEST_F(BlacklistTest, AddDllsFromRegistryToBlacklist) {
HKEY_CURRENT_USER,
blacklist::kRegistryFinchListPath,
KEY_QUERY_VALUE | KEY_SET_VALUE);
- for (int i = 0; i < arraysize(test_data); ++i) {
+ for (size_t i = 0; i < arraysize(test_data); ++i) {
finch_blacklist_registry_key.WriteValue(test_data[i].dll_name,
test_data[i].dll_name);
}
diff --git a/chrome_elf/elf_imports_unittest.cc b/chrome_elf/elf_imports_unittest.cc
index 87a1f59..806ed79 100644
--- a/chrome_elf/elf_imports_unittest.cc
+++ b/chrome_elf/elf_imports_unittest.cc
@@ -91,8 +91,8 @@ TEST_F(ELFImportsTest, ChromeElfSanityCheck) {
// Make sure all of ELF's imports are in the valid imports list.
for (const std::string& import : elf_imports) {
bool match = false;
- for (int i = 0; i < arraysize(kValidFilePatterns); ++i) {
- if (base::MatchPattern(import, kValidFilePatterns[i])) {
+ for (const char* kValidFilePattern : kValidFilePatterns) {
+ if (base::MatchPattern(import, kValidFilePattern)) {
match = true;
break;
}