| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <windows.h> | 5 #include <windows.h> |
| 6 #include <atlsecurity.h> // NOLINT | 6 #include <atlsecurity.h> // NOLINT |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/win/registry.h" | 9 #include "base/win/registry.h" |
| 10 #include "chrome/installer/util/delete_reg_key_work_item.h" | 10 #include "chrome/installer/util/delete_reg_key_work_item.h" |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 KEY_QUERY_VALUE)); | 119 KEY_QUERY_VALUE)); |
| 120 item->Rollback(); | 120 item->Rollback(); |
| 121 item.reset(); | 121 item.reset(); |
| 122 EXPECT_EQ(ERROR_SUCCESS, key.Open(test_data_.root_key(), key_name.c_str(), | 122 EXPECT_EQ(ERROR_SUCCESS, key.Open(test_data_.root_key(), key_name.c_str(), |
| 123 KEY_QUERY_VALUE)); | 123 KEY_QUERY_VALUE)); |
| 124 std::wstring str_value; | 124 std::wstring str_value; |
| 125 EXPECT_EQ(ERROR_SUCCESS, key.ReadValue(NULL, &str_value)); | 125 EXPECT_EQ(ERROR_SUCCESS, key.ReadValue(NULL, &str_value)); |
| 126 EXPECT_EQ(key_name, str_value); | 126 EXPECT_EQ(key_name, str_value); |
| 127 EXPECT_EQ(ERROR_SUCCESS, key.OpenKey(L"Subkey", KEY_READ | WRITE_DAC)); | 127 EXPECT_EQ(ERROR_SUCCESS, key.OpenKey(L"Subkey", KEY_READ | WRITE_DAC)); |
| 128 dw_value = 0; | 128 dw_value = 0; |
| 129 EXPECT_EQ(ERROR_SUCCESS, key.ReadValueDW(L"SomeValue", &dw_value)); | 129 EXPECT_EQ(ERROR_SUCCESS, key.ReadValue(L"SomeValue", &dw_value)); |
| 130 EXPECT_EQ(1U, dw_value); | 130 EXPECT_EQ(1U, dw_value); |
| 131 // Give users all access to the subkey so it can be deleted. | 131 // Give users all access to the subkey so it can be deleted. |
| 132 EXPECT_EQ(ERROR_SUCCESS, | 132 EXPECT_EQ(ERROR_SUCCESS, |
| 133 RegSetKeySecurity(key.Handle(), DACL_SECURITY_INFORMATION, | 133 RegSetKeySecurity(key.Handle(), DACL_SECURITY_INFORMATION, |
| 134 const_cast<SECURITY_DESCRIPTOR*>( | 134 const_cast<SECURITY_DESCRIPTOR*>( |
| 135 sec_desc.GetPSECURITY_DESCRIPTOR()))); | 135 sec_desc.GetPSECURITY_DESCRIPTOR()))); |
| 136 EXPECT_EQ(ERROR_SUCCESS, key.OpenKey(L"Subkey2", KEY_QUERY_VALUE)); | 136 EXPECT_EQ(ERROR_SUCCESS, key.OpenKey(L"Subkey2", KEY_QUERY_VALUE)); |
| 137 EXPECT_EQ(ERROR_SUCCESS, key.ReadValueDW(L"", &dw_value)); | 137 EXPECT_EQ(ERROR_SUCCESS, key.ReadValue(L"", &dw_value)); |
| 138 EXPECT_EQ(2U, dw_value); | 138 EXPECT_EQ(2U, dw_value); |
| 139 } | 139 } |
| OLD | NEW |