Regkey functions return error code instead of bool

Change the Regkey helper to consistently use and return LONG
instead of bool.  Fix RegKey usage all over the code base and
get rid of workarounds due to lack of return value.

Reviewers:

brettw: everything (skip parts for other reviewers if you wish)
robertshield,grt: chrome_frame, installer
siggi: ceee


BUG=none
TEST=covered by existing tests



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

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

1 files changed, 9 insertions, 8 deletions

diff --git a/chrome/browser/rlz/rlz_unittest.cc b/chrome/browser/rlz/rlz_unittest.cc
index f2ca69f..1b53bf6e4 100644
--- a/chrome/browser/rlz/rlz_unittest.cc
+++ b/chrome/browser/rlz/rlz_unittest.cc
@@ -16,9 +16,10 @@ namespace {
 // is nothing to clean.
 bool CleanValue(const wchar_t* key_name, const wchar_t* value) {
   RegKey key;
-  if (!key.Open(HKEY_CURRENT_USER, key_name, KEY_READ | KEY_WRITE))
+  if (key.Open(HKEY_CURRENT_USER, key_name, KEY_READ | KEY_WRITE) !=
+      ERROR_SUCCESS)
     return false;
-  EXPECT_TRUE(key.DeleteValue(value));
+  EXPECT_EQ(ERROR_SUCCESS, key.DeleteValue(value));
   return true;
 }
 
@@ -33,8 +34,8 @@ TEST(RlzLibTest, RecordProductEvent) {
       rlz_lib::CHROME_OMNIBOX, rlz_lib::FIRST_SEARCH));
   const wchar_t kEvent1[] = L"C1F";
   RegKey key1;
-  EXPECT_TRUE(key1.Open(HKEY_CURRENT_USER, kKeyName, KEY_READ));
-  EXPECT_TRUE(key1.ReadValueDW(kEvent1, &recorded_value));
+  EXPECT_EQ(ERROR_SUCCESS, key1.Open(HKEY_CURRENT_USER, kKeyName, KEY_READ));
+  EXPECT_EQ(ERROR_SUCCESS, key1.ReadValueDW(kEvent1, &recorded_value));
   EXPECT_EQ(1, recorded_value);
   EXPECT_TRUE(CleanValue(kKeyName, kEvent1));
 
@@ -42,9 +43,9 @@ TEST(RlzLibTest, RecordProductEvent) {
       rlz_lib::CHROME_HOME_PAGE, rlz_lib::SET_TO_GOOGLE));
   const wchar_t kEvent2[] = L"C2S";
   RegKey key2;
-  EXPECT_TRUE(key2.Open(HKEY_CURRENT_USER, kKeyName, KEY_READ));
+  EXPECT_EQ(ERROR_SUCCESS, key2.Open(HKEY_CURRENT_USER, kKeyName, KEY_READ));
   DWORD value = 0;
-  EXPECT_TRUE(key2.ReadValueDW(kEvent2, &recorded_value));
+  EXPECT_EQ(ERROR_SUCCESS, key2.ReadValueDW(kEvent2, &recorded_value));
   EXPECT_EQ(1, recorded_value);
   EXPECT_TRUE(CleanValue(kKeyName, kEvent2));
 }
@@ -55,8 +56,8 @@ TEST(RlzLibTest, CleanProductEvents) {
       rlz_lib::CHROME_OMNIBOX, rlz_lib::FIRST_SEARCH));
   const wchar_t kEvent1[] = L"C1F";
   RegKey key1;
-  EXPECT_TRUE(key1.Open(HKEY_CURRENT_USER, kKeyName, KEY_READ));
-  EXPECT_TRUE(key1.ReadValueDW(kEvent1, &recorded_value));
+  EXPECT_EQ(ERROR_SUCCESS, key1.Open(HKEY_CURRENT_USER, kKeyName, KEY_READ));
+  EXPECT_EQ(ERROR_SUCCESS, key1.ReadValueDW(kEvent1, &recorded_value));
   EXPECT_EQ(1, recorded_value);
 
   EXPECT_TRUE(RLZTracker::ClearAllProductEvents(rlz_lib::CHROME));