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

rlz/chromeos/lib/rlz_value_store_chromeos.h

 // 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.
 
 #ifndef RLZ_CHROMEOS_LIB_RLZ_VALUE_STORE_CHROMEOS_H_
 #define RLZ_CHROMEOS_LIB_RLZ_VALUE_STORE_CHROMEOS_H_
 
 #include "base/prefs/persistent_pref_store.h"
 #include "base/threading/non_thread_safe.h"
 #include "rlz/lib/rlz_value_store.h"
 
 namespace base {
 class ListValue;
 class SequencedTaskRunner;
 class Value;
 }
 
 template <typename T> struct DefaultSingletonTraits;
 
 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();
 
   // Sets the MessageLoopProxy that underlying PersistentPrefStore will post I/O
   // 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.
   static void ResetForTesting();
 
   // RlzValueStore overrides:
   virtual bool HasAccess(AccessType type) OVERRIDE;
 
   virtual bool WritePingTime(Product product, int64 time) OVERRIDE;
   virtual bool ReadPingTime(Product product, int64* time) OVERRIDE;
@@ skipping 44 matching lines @@
 
   // Store with RLZ data.
   scoped_refptr<PersistentPrefStore> rlz_store_;
 
   DISALLOW_COPY_AND_ASSIGN(RlzValueStoreChromeOS);
 };
 
 }  // namespace rlz_lib
 
 #endif  // RLZ_CHROMEOS_LIB_RLZ_VALUE_STORE_CHROMEOS_H_