| Index: chrome_elf/chrome_elf_util_unittest.cc
|
| diff --git a/chrome_elf/chrome_elf_util_unittest.cc b/chrome_elf/chrome_elf_util_unittest.cc
|
| index b8cf69662d72873e8cedb0a33bf97b13c96e74de..7a67fe2a1038a88922b8539ae897bac8fd41b725 100644
|
| --- a/chrome_elf/chrome_elf_util_unittest.cc
|
| +++ b/chrome_elf/chrome_elf_util_unittest.cc
|
| @@ -121,112 +121,6 @@ TEST(ChromeElfUtilTest, BrowserProcessSecurityTest) {
|
| EXPECT_TRUE(IsSecuritySet());
|
| }
|
|
|
| -//------------------------------------------------------------------------------
|
| -// NT registry API tests (chrome_elf_reg)
|
| -//------------------------------------------------------------------------------
|
| -
|
| -TEST(ChromeElfUtilTest, NTRegistry) {
|
| - HANDLE key_handle;
|
| - const wchar_t* dword_val_name = L"DwordTestValue";
|
| - DWORD dword_val = 1234;
|
| - const wchar_t* sz_val_name = L"SzTestValue";
|
| - base::string16 sz_val = L"blah de blah de blahhhhh.";
|
| - const wchar_t* sz_val_name2 = L"SzTestValueEmpty";
|
| - base::string16 sz_val2 = L"";
|
| - const wchar_t* multisz_val_name = L"SzmultiTestValue";
|
| - std::vector<base::string16> multisz_val;
|
| - base::string16 multi1 = L"one";
|
| - base::string16 multi2 = L"two";
|
| - base::string16 multi3 = L"three";
|
| - const wchar_t* multisz_val_name2 = L"SzmultiTestValueBad";
|
| - base::string16 multi_empty = L"";
|
| - const wchar_t* sz_new_key_1 = L"test\\new\\subkey";
|
| - const wchar_t* sz_new_key_2 = L"test\\new\\subkey\\blah\\";
|
| - const wchar_t* sz_new_key_3 = L"\\test\\new\\subkey\\\\blah2";
|
| -
|
| - // Set up registry override for this test.
|
| - registry_util::RegistryOverrideManager override_manager;
|
| - RegRedirect(nt::HKCU, override_manager);
|
| -
|
| - // Create a temp key to play under.
|
| - ASSERT_TRUE(nt::CreateRegKey(nt::HKCU, elf_sec::kRegSecurityPath,
|
| - KEY_ALL_ACCESS, &key_handle));
|
| -
|
| - // Exercise the supported getter & setter functions.
|
| - EXPECT_TRUE(nt::SetRegValueDWORD(key_handle, dword_val_name, dword_val));
|
| - EXPECT_TRUE(nt::SetRegValueSZ(key_handle, sz_val_name, sz_val));
|
| - EXPECT_TRUE(nt::SetRegValueSZ(key_handle, sz_val_name2, sz_val2));
|
| -
|
| - DWORD get_dword = 0;
|
| - base::string16 get_sz;
|
| - EXPECT_TRUE(nt::QueryRegValueDWORD(key_handle, dword_val_name, &get_dword) &&
|
| - get_dword == dword_val);
|
| - EXPECT_TRUE(nt::QueryRegValueSZ(key_handle, sz_val_name, &get_sz) &&
|
| - get_sz.compare(sz_val) == 0);
|
| - EXPECT_TRUE(nt::QueryRegValueSZ(key_handle, sz_val_name2, &get_sz) &&
|
| - get_sz.compare(sz_val2) == 0);
|
| -
|
| - multisz_val.push_back(multi1);
|
| - multisz_val.push_back(multi2);
|
| - multisz_val.push_back(multi3);
|
| - EXPECT_TRUE(
|
| - nt::SetRegValueMULTISZ(key_handle, multisz_val_name, multisz_val));
|
| - multisz_val.clear();
|
| - multisz_val.push_back(multi_empty);
|
| - EXPECT_TRUE(
|
| - nt::SetRegValueMULTISZ(key_handle, multisz_val_name2, multisz_val));
|
| - multisz_val.clear();
|
| -
|
| - EXPECT_TRUE(
|
| - nt::QueryRegValueMULTISZ(key_handle, multisz_val_name, &multisz_val));
|
| - if (multisz_val.size() == 3) {
|
| - EXPECT_TRUE(multi1.compare(multisz_val.at(0)) == 0);
|
| - EXPECT_TRUE(multi2.compare(multisz_val.at(1)) == 0);
|
| - EXPECT_TRUE(multi3.compare(multisz_val.at(2)) == 0);
|
| - } else {
|
| - EXPECT_TRUE(false);
|
| - }
|
| - multisz_val.clear();
|
| -
|
| - EXPECT_TRUE(
|
| - nt::QueryRegValueMULTISZ(key_handle, multisz_val_name2, &multisz_val));
|
| - if (multisz_val.size() == 1) {
|
| - EXPECT_TRUE(multi_empty.compare(multisz_val.at(0)) == 0);
|
| - } else {
|
| - EXPECT_TRUE(false);
|
| - }
|
| - multisz_val.clear();
|
| -
|
| - // Clean up
|
| - EXPECT_TRUE(nt::DeleteRegKey(key_handle));
|
| - nt::CloseRegKey(key_handle);
|
| -
|
| - // More tests for CreateRegKey recursion.
|
| - ASSERT_TRUE(
|
| - nt::CreateRegKey(nt::HKCU, sz_new_key_1, KEY_ALL_ACCESS, nullptr));
|
| - EXPECT_TRUE(nt::OpenRegKey(nt::HKCU, sz_new_key_1, KEY_ALL_ACCESS,
|
| - &key_handle, nullptr));
|
| - EXPECT_TRUE(nt::DeleteRegKey(key_handle));
|
| - nt::CloseRegKey(key_handle);
|
| -
|
| - ASSERT_TRUE(
|
| - nt::CreateRegKey(nt::HKCU, sz_new_key_2, KEY_ALL_ACCESS, nullptr));
|
| - EXPECT_TRUE(nt::OpenRegKey(nt::HKCU, sz_new_key_2, KEY_ALL_ACCESS,
|
| - &key_handle, nullptr));
|
| - EXPECT_TRUE(nt::DeleteRegKey(key_handle));
|
| - nt::CloseRegKey(key_handle);
|
| -
|
| - ASSERT_TRUE(
|
| - nt::CreateRegKey(nt::HKCU, sz_new_key_3, KEY_ALL_ACCESS, nullptr));
|
| - EXPECT_TRUE(nt::OpenRegKey(nt::HKCU, L"test\\new\\subkey\\blah2",
|
| - KEY_ALL_ACCESS, &key_handle, nullptr));
|
| - EXPECT_TRUE(nt::DeleteRegKey(key_handle));
|
| - nt::CloseRegKey(key_handle);
|
| -
|
| - ASSERT_TRUE(nt::CreateRegKey(nt::HKCU, nullptr, KEY_ALL_ACCESS, &key_handle));
|
| - nt::CloseRegKey(key_handle);
|
| -}
|
| -
|
| // Parameterized test with paramters:
|
| // 1: product: "canary" or "google"
|
| // 2: install level: "user" or "system"
|
|
|