Index: chrome/browser/chrome_elf_init_unittest_win.cc |
diff --git a/chrome/browser/chrome_elf_init_unittest_win.cc b/chrome/browser/chrome_elf_init_unittest_win.cc |
index 648de0a5925a41f905fbf6bfe005a6a490b171da..f0d5a77e4ba54abece2dac12eae2109fad06bd0b 100644 |
--- a/chrome/browser/chrome_elf_init_unittest_win.cc |
+++ b/chrome/browser/chrome_elf_init_unittest_win.cc |
@@ -165,8 +165,9 @@ TEST_F(ChromeBlacklistTrialTest, AddFinchBlacklistToRegistry) { |
// Set up the trial with the desired parameters. |
std::map<std::string, std::string> desired_params; |
- desired_params["TestDllName1"] = "TestDll1.dll"; |
- desired_params["TestDllName2"] = "TestDll2.dll"; |
+ |
+ desired_params[blacklist::kRegistryFinchListValueNameStr] = |
+ "TestDll1.dll,TestDll2.dll"; |
variations::AssociateVariationParams( |
kBrowserBlacklistTrialName, |
@@ -176,21 +177,22 @@ TEST_F(ChromeBlacklistTrialTest, AddFinchBlacklistToRegistry) { |
// This should add the dlls in those parameters to the registry. |
AddFinchBlacklistToRegistry(); |
- // Check that all the values in desired_params were added to the registry. |
+ // Check that all the dll names in desired_params were added to the registry. |
+ std::vector<std::wstring> dlls; |
+ |
base::win::RegKey finch_blacklist_registry_key( |
HKEY_CURRENT_USER, |
blacklist::kRegistryFinchListPath, |
KEY_QUERY_VALUE | KEY_SET_VALUE); |
- ASSERT_EQ(desired_params.size(), |
- finch_blacklist_registry_key.GetValueCount()); |
+ ASSERT_TRUE(finch_blacklist_registry_key.HasValue( |
+ blacklist::kRegistryFinchListValueName)); |
+ ASSERT_EQ(ERROR_SUCCESS, finch_blacklist_registry_key.ReadValues( |
+ blacklist::kRegistryFinchListValueName, &dlls)); |
- for (std::map<std::string, std::string>::iterator it = desired_params.begin(); |
- it != desired_params.end(); |
- ++it) { |
- std::wstring name = base::UTF8ToWide(it->first); |
- ASSERT_TRUE(finch_blacklist_registry_key.HasValue(name.c_str())); |
- } |
+ ASSERT_EQ(2, /* Number of dll names passed in this test. */ dlls.size()); |
+ EXPECT_TRUE((dlls.at(0)).compare(L"TestDll1.dll") == 0); |
robertshield
2016/04/20 05:16:09
How about:
EXPECT_STREQ(L"TestDll.dll", dlls[0].c_
penny
2016/05/28 01:34:22
Done.
|
+ EXPECT_TRUE((dlls.at(1)).compare(L"TestDll2.dll") == 0); |
} |
} // namespace |