[cros] RlzValueStore made protected by a cross-process lock and not persisted over browser lifetime…

rlz/lib/rlz_value_store.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_VALUE_STORE_H_
 #define RLZ_VALUE_STORE_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "rlz/lib/rlz_enums.h"
@@ skipping 77 matching lines @@
  public:
   ScopedRlzValueStoreLock();
   ~ScopedRlzValueStoreLock();
 
   // Returns a RlzValueStore protected by a cross-process lock, or NULL if the
   // lock can't be obtained. The lifetime of the returned object is limited to
   // the lifetime of this ScopedRlzValueStoreLock object.
   RlzValueStore* GetStore();
 
  private:
-#if defined(OS_WIN) || defined(OS_MACOSX)
-  // On ChromeOS, there is a singleton instance of RlzValueStore.
   scoped_ptr<RlzValueStore> store_;
-#elif defined(OS_CHROMEOS)
-  class RlzValueStoreChromeOS* store_;
-#endif
 #if defined(OS_WIN)
   LibMutex lock_;
 #elif defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool autorelease_pool_;
 #endif
 };
 
-#if defined(OS_MACOSX) || defined(OS_CHROMEOS)
+#if defined(OS_POSIX)
 namespace testing {
 // Prefix |directory| to the path where the RLZ data file lives, for tests.
 void SetRlzStoreDirectory(const FilePath& directory);
+
+// Returns the path of the file used as data store.
+std::string RlzStoreFilenameStr();
 }  // namespace testing
-#endif  // defined(OS_MACOSX) || defined(OS_CHROMEOS)
-
-#if defined(OS_MACOSX)
-namespace testing {
-// Returns the path of the plist file used as data store.
-std::string RlzPlistFilenameStr();
-}  // namespace testing
-#endif  // defined(OS_MACOSX)
-
+#endif  // defined(OS_POSIX)
 
 }  // namespace rlz_lib
 
 #endif  // RLZ_VALUE_STORE_H_