base/win: small improvement to RegKey API.

chrome/installer/util/set_reg_value_work_item_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <windows.h>
 
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/win/registry.h"
@@ skipping 57 matching lines @@
   DWORD read_dword;
   EXPECT_EQ(ERROR_SUCCESS, key.ReadValue(name_str.c_str(), &read_out));
   EXPECT_EQ(ERROR_SUCCESS, key.ReadValueDW(name_dword.c_str(), &read_dword));
   EXPECT_EQ(read_out, data_str_1);
   EXPECT_EQ(read_dword, dword1);
 
   work_item1->Rollback();
   work_item2->Rollback();
 
   // Rollback should delete the value.
-  EXPECT_FALSE(key.ValueExists(name_str.c_str()));
-  EXPECT_FALSE(key.ValueExists(name_dword.c_str()));
+  EXPECT_FALSE(key.HasValue(name_str.c_str()));
+  EXPECT_FALSE(key.HasValue(name_dword.c_str()));
 }
 
 // Write a new value with overwrite flag. The value should be set.
 TEST_F(SetRegValueWorkItemTest, WriteNewOverwrite) {
   RegKey key;
 
   std::wstring parent_key(test_root);
   file_util::AppendToPath(&parent_key, L"WriteNewOverwrite");
   ASSERT_EQ(ERROR_SUCCESS,
       key.Create(HKEY_CURRENT_USER, parent_key.c_str(), KEY_READ));
@@ skipping 16 matching lines @@
   DWORD read_dword;
   EXPECT_EQ(ERROR_SUCCESS, key.ReadValue(name_str.c_str(), &read_out));
   EXPECT_EQ(ERROR_SUCCESS, key.ReadValueDW(name_dword.c_str(), &read_dword));
   EXPECT_EQ(read_out, data_str_1);
   EXPECT_EQ(read_dword, dword1);
 
   work_item1->Rollback();
   work_item2->Rollback();
 
   // Rollback should delete the value.
-  EXPECT_FALSE(key.ValueExists(name_str.c_str()));
-  EXPECT_FALSE(key.ValueExists(name_dword.c_str()));
+  EXPECT_FALSE(key.HasValue(name_str.c_str()));
+  EXPECT_FALSE(key.HasValue(name_dword.c_str()));
 }
 
 // Write to an existing value without overwrite flag. There should be
 // no change.
 TEST_F(SetRegValueWorkItemTest, WriteExistingNonOverwrite) {
   RegKey key;
 
   std::wstring parent_key(test_root);
   file_util::AppendToPath(&parent_key, L"WriteExistingNonOverwrite");
   ASSERT_EQ(ERROR_SUCCESS,
       key.Create(HKEY_CURRENT_USER, parent_key.c_str(),
                  KEY_READ | KEY_SET_VALUE));
 
   // First test REG_SZ value.
   // Write data to the value we are going to set.
   std::wstring name(L"name_str");
   ASSERT_EQ(ERROR_SUCCESS, key.WriteValue(name.c_str(), data_str_1));
 
   std::wstring data(data_str_2);
   scoped_ptr<SetRegValueWorkItem> work_item(
       WorkItem::CreateSetRegValueWorkItem(HKEY_CURRENT_USER, parent_key,
                                           name, data, false));
   EXPECT_TRUE(work_item->Do());
 
   std::wstring read_out;
   EXPECT_EQ(ERROR_SUCCESS, key.ReadValue(name.c_str(), &read_out));
   EXPECT_EQ(0, read_out.compare(data_str_1));
 
   work_item->Rollback();
-  EXPECT_TRUE(key.ValueExists(name.c_str()));
+  EXPECT_TRUE(key.HasValue(name.c_str()));
   EXPECT_EQ(ERROR_SUCCESS, key.ReadValue(name.c_str(), &read_out));
   EXPECT_EQ(read_out, data_str_1);
 
   // Now test REG_DWORD value.
   // Write data to the value we are going to set.
   name.assign(L"name_dword");
   ASSERT_EQ(ERROR_SUCCESS, key.WriteValue(name.c_str(), dword1));
   work_item.reset(WorkItem::CreateSetRegValueWorkItem(HKEY_CURRENT_USER,
       parent_key, name, dword2, false));
   EXPECT_TRUE(work_item->Do());
 
   DWORD read_dword;
   EXPECT_EQ(ERROR_SUCCESS, key.ReadValueDW(name.c_str(), &read_dword));
   EXPECT_EQ(read_dword, dword1);
 
   work_item->Rollback();
-  EXPECT_TRUE(key.ValueExists(name.c_str()));
+  EXPECT_TRUE(key.HasValue(name.c_str()));
   EXPECT_EQ(ERROR_SUCCESS, key.ReadValueDW(name.c_str(), &read_dword));
   EXPECT_EQ(read_dword, dword1);
 }
 
 // Write to an existing value with overwrite flag. The value should be
 // overwritten.
 TEST_F(SetRegValueWorkItemTest, WriteExistingOverwrite) {
   RegKey key;
 
   std::wstring parent_key(test_root);
@@ skipping 25 matching lines @@
   std::wstring read_out;
   EXPECT_EQ(ERROR_SUCCESS, key.ReadValue(name.c_str(), &read_out));
   EXPECT_EQ(0, read_out.compare(data_str_2));
 
   EXPECT_EQ(ERROR_SUCCESS, key.ReadValue(name_empty.c_str(), &read_out));
   EXPECT_EQ(0, read_out.compare(data_str_2));
 
   work_item1->Rollback();
   work_item2->Rollback();
 
-  EXPECT_TRUE(key.ValueExists(name.c_str()));
+  EXPECT_TRUE(key.HasValue(name.c_str()));
   EXPECT_EQ(ERROR_SUCCESS, key.ReadValue(name.c_str(), &read_out));
   EXPECT_EQ(read_out, data_str_1);
 
   DWORD type = 0;
   DWORD size = 0;
   EXPECT_EQ(ERROR_SUCCESS, key.ReadValue(name_empty.c_str(), NULL, &size,
                                          &type));
   EXPECT_EQ(REG_SZ, type);
   EXPECT_EQ(0, size);
 
   // Now test REG_DWORD value.
   // Write data to the value we are going to set.
   name.assign(L"name_dword");
   ASSERT_EQ(ERROR_SUCCESS, key.WriteValue(name.c_str(), dword1));
   scoped_ptr<SetRegValueWorkItem> work_item3(
       WorkItem::CreateSetRegValueWorkItem(HKEY_CURRENT_USER, parent_key, name,
                                           dword2, true));
   EXPECT_TRUE(work_item3->Do());
 
   DWORD read_dword;
   EXPECT_EQ(ERROR_SUCCESS, key.ReadValueDW(name.c_str(), &read_dword));
   EXPECT_EQ(read_dword, dword2);
 
   work_item3->Rollback();
-  EXPECT_TRUE(key.ValueExists(name.c_str()));
+  EXPECT_TRUE(key.HasValue(name.c_str()));
   EXPECT_EQ(ERROR_SUCCESS, key.ReadValueDW(name.c_str(), &read_dword));
   EXPECT_EQ(read_dword, dword1);
 }
 
 // Write a value to a non-existing key. This should fail.
 TEST_F(SetRegValueWorkItemTest, WriteNonExistingKey) {
   RegKey key;
 
   std::wstring parent_key(test_root);
   file_util::AppendToPath(&parent_key, L"WriteNonExistingKey");
 
   std::wstring name(L"name");
   std::wstring data(data_str_1);
   scoped_ptr<SetRegValueWorkItem> work_item(
       WorkItem::CreateSetRegValueWorkItem(HKEY_CURRENT_USER, parent_key,
                                           name, data, false));
   EXPECT_FALSE(work_item->Do());
 
   work_item.reset(WorkItem::CreateSetRegValueWorkItem(HKEY_CURRENT_USER,
       parent_key, name, dword1, false));
   EXPECT_FALSE(work_item->Do());
 }