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

Unified Diff: rlz/chromeos/lib/rlz_value_store_chromeos.cc

Issue 11275284: [cros,rlz] Financial ping livelock fix and proper shutdown. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Enable on Chromium for testing (DO NOT COMMIT) Created 8 years, 1 month 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: rlz/chromeos/lib/rlz_value_store_chromeos.cc
diff --git a/rlz/chromeos/lib/rlz_value_store_chromeos.cc b/rlz/chromeos/lib/rlz_value_store_chromeos.cc
index 2f75887643a29e89ddb2ea7367bff28453468e29..ddf73e7e1d10b51a01194f463bb367a2ce152185 100644
--- a/rlz/chromeos/lib/rlz_value_store_chromeos.cc
+++ b/rlz/chromeos/lib/rlz_value_store_chromeos.cc
@@ -90,6 +90,12 @@ void RlzValueStoreChromeOS::ResetForTesting() {
GetInstance()->ReadPrefs();
}
+// static
+void RlzValueStoreChromeOS::Cleanup() {
+ if (created_)
+ GetInstance()->rlz_store_ = NULL;
+}
+
RlzValueStoreChromeOS::RlzValueStoreChromeOS() {
ReadPrefs();
created_ = true;
@@ -263,7 +269,6 @@ bool RlzValueStoreChromeOS::RemoveValueFromList(std::string list_name,
ScopedRlzValueStoreLock::ScopedRlzValueStoreLock()
: store_(RlzValueStoreChromeOS::GetInstance()) {
- DCHECK(store_->CalledOnValidThread());
}
ScopedRlzValueStoreLock::~ScopedRlzValueStoreLock() {

Powered by Google App Engine
This is Rietveld 408576698