Regkey functions return error code instead of bool

chrome/browser/rlz/rlz_unittest.cc

Index: chrome/browser/rlz/rlz_unittest.cc
===================================================================
--- chrome/browser/rlz/rlz_unittest.cc	(revision 70917)
+++ chrome/browser/rlz/rlz_unittest.cc	(working copy)
@@ -16,9 +16,10 @@
 // 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))
+  LONG result = key.Open(HKEY_CURRENT_USER, key_name, KEY_READ | KEY_WRITE);
+  if (result != ERROR_SUCCESS)
     return false;
-  EXPECT_TRUE(key.DeleteValue(value));
+  EXPECT_EQ(ERROR_SUCCESS, key.DeleteValue(value));
   return true;
 }
 
@@ -33,8 +34,8 @@
       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 @@
       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 @@
       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));