[cros,rlz] Financial ping livelock fix and proper shutdown.

rlz/chromeos/lib/rlz_value_store_chromeos.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "rlz/chromeos/lib/rlz_value_store_chromeos.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
@@ skipping 72 matching lines @@
   io_task_runner_->AddRef();
 }
 
 // static
 void RlzValueStoreChromeOS::ResetForTesting() {
   // Make sure we don't create an instance if it didn't exist.
   if (created_)
     GetInstance()->ReadPrefs();
 }
 
+// static
+void RlzValueStoreChromeOS::Cleanup() {
+  if (created_)
+    GetInstance()->rlz_store_ = NULL;
+}
+
 RlzValueStoreChromeOS::RlzValueStoreChromeOS() {
   ReadPrefs();
   created_ = true;
 }
 
 RlzValueStoreChromeOS::~RlzValueStoreChromeOS() {
 }
 
 bool RlzValueStoreChromeOS::HasAccess(AccessType type) {
   return type == kReadAccess || !rlz_store_->ReadOnly();
@@ skipping 153 matching lines @@
   rlz_store_->MarkNeedsEmptyValue(list_name);
   size_t index;
   if (list->Remove(value, &index))
     rlz_store_->ReportValueChanged(list_name);
   return true;
 }
 
 
 ScopedRlzValueStoreLock::ScopedRlzValueStoreLock()
     : store_(RlzValueStoreChromeOS::GetInstance()) {
-  DCHECK(store_->CalledOnValidThread());
 }
 
 ScopedRlzValueStoreLock::~ScopedRlzValueStoreLock() {
 }
 
 RlzValueStore* ScopedRlzValueStoreLock::GetStore() {
   return store_;
 }
 
 namespace testing {
 
 void SetRlzStoreDirectory(const FilePath& directory) {
   g_testing_rlz_store_path_ = directory;
 }
 
 }  // namespace testing
 
 }  // namespace rlz_lib