Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(217)

Unified Diff: ceee/ie/common/ceee_module_util_unittest.cc

Issue 6090006: Regkey functions return error code instead of bool (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ceee/ie/common/ceee_module_util_unittest.cc
===================================================================
--- ceee/ie/common/ceee_module_util_unittest.cc (revision 70414)
+++ ceee/ie/common/ceee_module_util_unittest.cc (working copy)
@@ -207,16 +207,20 @@
base::win::RegKey hkcu(HKEY_CURRENT_USER,
ceee_module_util::GetCromeFrameClientStateKey().c_str(), KEY_WRITE);
- ASSERT_TRUE(hkcu.WriteValue(google_update::kRegUsageStatsField, kTrue));
+ ASSERT_EQ(ERROR_SUCCESS,
+ hkcu.WriteValue(google_update::kRegUsageStatsField, kTrue));
EXPECT_TRUE(ceee_module_util::GetCollectStatsConsent());
- ASSERT_TRUE(hkcu.WriteValue(google_update::kRegUsageStatsField, kFalse));
+ ASSERT_EQ(ERROR_SUCCESS,
+ hkcu.WriteValue(google_update::kRegUsageStatsField, kFalse));
EXPECT_FALSE(ceee_module_util::GetCollectStatsConsent());
- ASSERT_TRUE(hkcu.WriteValue(google_update::kRegUsageStatsField, kInvalid));
+ ASSERT_EQ(ERROR_SUCCESS,
+ hkcu.WriteValue(google_update::kRegUsageStatsField, kInvalid));
EXPECT_FALSE(ceee_module_util::GetCollectStatsConsent());
- ASSERT_TRUE(hkcu.DeleteValue(google_update::kRegUsageStatsField));
+ ASSERT_EQ(ERROR_SUCCESS,
+ hkcu.DeleteValue(google_update::kRegUsageStatsField));
EXPECT_FALSE(ceee_module_util::GetCollectStatsConsent());
}
@@ -225,16 +229,20 @@
base::win::RegKey hklm(HKEY_LOCAL_MACHINE,
ceee_module_util::GetCromeFrameClientStateKey().c_str(), KEY_WRITE);
- ASSERT_TRUE(hklm.WriteValue(google_update::kRegUsageStatsField, kTrue));
+ ASSERT_EQ(ERROR_SUCCESS,
+ hklm.WriteValue(google_update::kRegUsageStatsField, kTrue));
EXPECT_TRUE(ceee_module_util::GetCollectStatsConsent());
- ASSERT_TRUE(hklm.WriteValue(google_update::kRegUsageStatsField, kFalse));
+ ASSERT_EQ(ERROR_SUCCESS,
+ hklm.WriteValue(google_update::kRegUsageStatsField, kFalse));
EXPECT_FALSE(ceee_module_util::GetCollectStatsConsent());
- ASSERT_TRUE(hklm.WriteValue(google_update::kRegUsageStatsField, kInvalid));
+ ASSERT_EQ(ERROR_SUCCESS,
+ hklm.WriteValue(google_update::kRegUsageStatsField, kInvalid));
EXPECT_FALSE(ceee_module_util::GetCollectStatsConsent());
- ASSERT_TRUE(hklm.DeleteValue(google_update::kRegUsageStatsField));
+ ASSERT_EQ(ERROR_SUCCESS,
+ hklm.DeleteValue(google_update::kRegUsageStatsField));
EXPECT_FALSE(ceee_module_util::GetCollectStatsConsent());
}
@@ -246,14 +254,18 @@
base::win::RegKey hklm(HKEY_LOCAL_MACHINE,
ceee_module_util::GetCromeFrameClientStateKey().c_str(), KEY_WRITE);
- ASSERT_TRUE(hklm.WriteValue(google_update::kRegUsageStatsField, kTrue));
+ ASSERT_EQ(ERROR_SUCCESS,
+ hklm.WriteValue(google_update::kRegUsageStatsField, kTrue));
ASSERT_TRUE(ceee_module_util::GetCollectStatsConsent());
- ASSERT_TRUE(hkcu.WriteValue(google_update::kRegUsageStatsField, kFalse));
+ ASSERT_EQ(ERROR_SUCCESS,
+ hkcu.WriteValue(google_update::kRegUsageStatsField, kFalse));
EXPECT_FALSE(ceee_module_util::GetCollectStatsConsent());
- ASSERT_TRUE(hkcu.DeleteValue(google_update::kRegUsageStatsField));
- ASSERT_TRUE(hklm.DeleteValue(google_update::kRegUsageStatsField));
+ ASSERT_EQ(ERROR_SUCCESS,
+ hkcu.DeleteValue(google_update::kRegUsageStatsField));
+ ASSERT_EQ(ERROR_SUCCESS,
+ hklm.DeleteValue(google_update::kRegUsageStatsField));
}
} // namespace

Powered by Google App Engine
This is Rietveld 408576698