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

rlz/chromeos/lib/rlz_value_store_chromeos.h

Index: rlz/chromeos/lib/rlz_value_store_chromeos.h
diff --git a/rlz/chromeos/lib/rlz_value_store_chromeos.h b/rlz/chromeos/lib/rlz_value_store_chromeos.h
index 245ae0081a8df9d540d52cfa28d1a192abbb31bb..c9456a828e9552f8f8ab33bb3109fdb78bdaee57 100644
--- a/rlz/chromeos/lib/rlz_value_store_chromeos.h
+++ b/rlz/chromeos/lib/rlz_value_store_chromeos.h
@@ -22,8 +22,7 @@ namespace rlz_lib {
 // An implementation of RlzValueStore for ChromeOS. Unlike Mac and Win
 // counterparts, it's non thread-safe and should only be accessed on a single
 // Thread instance that has a MessageLoop.
-class RlzValueStoreChromeOS : public RlzValueStore,
-                              public base::NonThreadSafe {
+class RlzValueStoreChromeOS : public RlzValueStore {
  public:
   static RlzValueStoreChromeOS* GetInstance();
 
@@ -31,6 +30,9 @@ class RlzValueStoreChromeOS : public RlzValueStore,
   // tasks to. Must be called before the first GetInstance() call.
   static void SetIOTaskRunner(base::SequencedTaskRunner* io_task_runner);
 
+  // Must be invoked during shutdown to commit pending I/O.
+  static void Cleanup();
+
   // Resets the store to its initial state. Should only be used for testing.
   // Same restrictions as for calling GetInstance() for the first time apply,
   // i.e. must call SetIOTaskRunner first.