base/win: small improvement to RegKey API.

- Rename ValueExists() to HasValue().
- Rename ValueCount()  to GetValueCount().
- Rename ReadName()    to GetValueNameAt().

R=maruel@chromium.org,willchan@chromium.org

Review URL: http://codereview.chromium.org/8337006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106074 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 22 insertions, 22 deletions

diff --git a/chrome/installer/util/delete_reg_value_work_item_unittest.cc b/chrome/installer/util/delete_reg_value_work_item_unittest.cc
index 634ee42..f0fa53e 100644
--- a/chrome/installer/util/delete_reg_value_work_item_unittest.cc
+++ b/chrome/installer/util/delete_reg_value_work_item_unittest.cc
@@ -71,9 +71,9 @@ TEST_F(DeleteRegValueWorkItemTest, DeleteExistingValue) {
   EXPECT_TRUE(work_item2->Do());
   EXPECT_TRUE(work_item3->Do());
 
-  EXPECT_FALSE(key.ValueExists(name_str.c_str()));
-  EXPECT_FALSE(key.ValueExists(name_dword.c_str()));
-  EXPECT_FALSE(key.ValueExists(name_empty.c_str()));
+  EXPECT_FALSE(key.HasValue(name_str.c_str()));
+  EXPECT_FALSE(key.HasValue(name_dword.c_str()));
+  EXPECT_FALSE(key.HasValue(name_empty.c_str()));
 
   work_item1->Rollback();
   work_item2->Rollback();
@@ -104,8 +104,8 @@ TEST_F(DeleteRegValueWorkItemTest, DeleteNonExistentValue) {
       key.Create(HKEY_CURRENT_USER, parent_key.c_str(), KEY_READ | KEY_WRITE));
   std::wstring name_str(L"name_str");
   std::wstring name_dword(L"name_dword");
-  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()));
 
   scoped_ptr<DeleteRegValueWorkItem> work_item1(
       WorkItem::CreateDeleteRegValueWorkItem(HKEY_CURRENT_USER, parent_key,
@@ -117,12 +117,12 @@ TEST_F(DeleteRegValueWorkItemTest, DeleteNonExistentValue) {
   EXPECT_TRUE(work_item1->Do());
   EXPECT_TRUE(work_item2->Do());
 
-  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()));
 
   work_item1->Rollback();
   work_item2->Rollback();
 
-  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()));
 }
diff --git a/chrome/installer/util/google_update_settings.cc b/chrome/installer/util/google_update_settings.cc
index b79e61a..babd396 100644
--- a/chrome/installer/util/google_update_settings.cc
+++ b/chrome/installer/util/google_update_settings.cc
@@ -102,7 +102,7 @@ bool RemoveGoogleUpdateStrKey(const wchar_t* const name) {
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   std::wstring reg_path = dist->GetStateKey();
   RegKey key(HKEY_CURRENT_USER, reg_path.c_str(), KEY_READ | KEY_WRITE);
-  if (!key.ValueExists(name))
+  if (!key.HasValue(name))
     return true;
   return (key.DeleteValue(name) == ERROR_SUCCESS);
 }
diff --git a/chrome/installer/util/install_util.cc b/chrome/installer/util/install_util.cc
index 1582397..acd3863 100644
--- a/chrome/installer/util/install_util.cc
+++ b/chrome/installer/util/install_util.cc
@@ -375,7 +375,7 @@ bool InstallUtil::DeleteRegistryValue(HKEY reg_root,
                                       const std::wstring& value_name) {
   RegKey key(reg_root, key_path.c_str(), KEY_ALL_ACCESS);
   VLOG(1) << "Deleting registry value " << value_name;
-  if (key.ValueExists(value_name.c_str())) {
+  if (key.HasValue(value_name.c_str())) {
     LONG result = key.DeleteValue(value_name.c_str());
     if (result != ERROR_SUCCESS) {
       LOG(ERROR) << "Failed to delete registry value: " << value_name
diff --git a/chrome/installer/util/install_util_unittest.cc b/chrome/installer/util/install_util_unittest.cc
index 57f61b6..9d5341d 100644
--- a/chrome/installer/util/install_util_unittest.cc
+++ b/chrome/installer/util/install_util_unittest.cc
@@ -293,7 +293,7 @@ TEST_F(InstallUtilTest, DeleteRegistryValueIf) {
           root, key_path.c_str(), value_name, pred));
       EXPECT_TRUE(RegKey(root, key_path.c_str(), KEY_QUERY_VALUE).Valid());
       EXPECT_TRUE(RegKey(root, key_path.c_str(),
-                         KEY_QUERY_VALUE).ValueExists(value_name));
+                         KEY_QUERY_VALUE).HasValue(value_name));
     }
 
     // Value exists, and matches: delete.
@@ -308,7 +308,7 @@ TEST_F(InstallUtilTest, DeleteRegistryValueIf) {
           root, key_path.c_str(), value_name, pred));
       EXPECT_TRUE(RegKey(root, key_path.c_str(), KEY_QUERY_VALUE).Valid());
       EXPECT_FALSE(RegKey(root, key_path.c_str(),
-                          KEY_QUERY_VALUE).ValueExists(value_name));
+                          KEY_QUERY_VALUE).HasValue(value_name));
     }
   }
 
@@ -327,7 +327,7 @@ TEST_F(InstallUtilTest, DeleteRegistryValueIf) {
           root, key_path.c_str(), L"", pred));
       EXPECT_TRUE(RegKey(root, key_path.c_str(), KEY_QUERY_VALUE).Valid());
       EXPECT_FALSE(RegKey(root, key_path.c_str(),
-                          KEY_QUERY_VALUE).ValueExists(L""));
+                          KEY_QUERY_VALUE).HasValue(L""));
     }
   }
 }
diff --git a/chrome/installer/util/set_reg_value_work_item_unittest.cc b/chrome/installer/util/set_reg_value_work_item_unittest.cc
index ea5ac86..0f3ef97 100644
--- a/chrome/installer/util/set_reg_value_work_item_unittest.cc
+++ b/chrome/installer/util/set_reg_value_work_item_unittest.cc
@@ -75,8 +75,8 @@ TEST_F(SetRegValueWorkItemTest, WriteNewNonOverwrite) {
   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.
@@ -113,8 +113,8 @@ TEST_F(SetRegValueWorkItemTest, WriteNewOverwrite) {
   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
@@ -144,7 +144,7 @@ TEST_F(SetRegValueWorkItemTest, WriteExistingNonOverwrite) {
   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);
 
@@ -161,7 +161,7 @@ TEST_F(SetRegValueWorkItemTest, WriteExistingNonOverwrite) {
   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);
 }
@@ -207,7 +207,7 @@ TEST_F(SetRegValueWorkItemTest, WriteExistingOverwrite) {
   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);
 
@@ -232,7 +232,7 @@ TEST_F(SetRegValueWorkItemTest, WriteExistingOverwrite) {
   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);
 }