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

rlz/lib/rlz_lib_test.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.
 //
 // A test application for the RLZ library.
 //
 // These tests should not be executed on the build server:
 // - They assert for the failed cases.
 // - They modify machine state (registry).
 //
@@ skipping 770 matching lines @@
     EXPECT_FALSE(rlz_lib::GetProductEventsAsCgi(rlz_lib::TOOLBAR_NOTIFIER,
                                                 value, 50));
     EXPECT_STREQ("", value);
   }
 
   EXPECT_TRUE(rlz_lib::GetProductEventsAsCgi(rlz_lib::TOOLBAR_NOTIFIER,
                                              value, 50));
   EXPECT_STREQ("events=I7S", value);
 }
 
-#if defined(OS_MACOSX)
+#if defined(OS_POSIX)
 class ReadonlyRlzDirectoryTest : public RlzLibTestNoMachineState {
  protected:
   virtual void SetUp() OVERRIDE;
 };
 
 void ReadonlyRlzDirectoryTest::SetUp() {
   RlzLibTestNoMachineState::SetUp();
   // Make the rlz directory non-writeable.
   int chmod_result = chmod(temp_dir_.path().value().c_str(), 0500);
   ASSERT_EQ(0, chmod_result);
-
 }
 
 TEST_F(ReadonlyRlzDirectoryTest, WriteFails) {
   // The rlz test runner runs every test twice: Once normally, and once with
   // a SupplementaryBranding on the stack. In the latter case, the rlz lock
   // has already been acquired before the rlz directory got changed to
   // read-only, which makes this test pointless. So run it only in the first
   // pass.
   if (!rlz_lib::SupplementaryBranding::GetBrand().empty())
     return;
@@ skipping 53 matching lines @@
   for (size_t i = 0; i < pids.size(); ++i) {
     if (HANDLE_EINTR(waitpid(pids[i], &status, 0)) != -1)
       EXPECT_TRUE(WIFEXITED(status) && WEXITSTATUS(status) == 0);
   }
 
   // No child should have the lock at this point, not even the crashed ones.
   EXPECT_TRUE(rlz_lib::RecordProductEvent(rlz_lib::TOOLBAR_NOTIFIER,
       rlz_lib::IE_DEFAULT_SEARCH, rlz_lib::INSTALL));
 }
 
-TEST_F(RlzLibTest, LockAcquistionSucceedsButPlistCannotBeCreated) {
+TEST_F(RlzLibTest, LockAcquistionSucceedsButStoreFileCannotBeCreated) {
   // See the comment at the top of WriteFails.
   if (!rlz_lib::SupplementaryBranding::GetBrand().empty())
     return;
 
   // Create a directory where the rlz file is supposed to appear. This way,
   // the lock file can be created successfully, but creation of the rlz file
   // itself will fail.
-  int mkdir_result = mkdir(rlz_lib::testing::RlzPlistFilenameStr().c_str(),
+  int mkdir_result = mkdir(rlz_lib::testing::RlzStoreFilenameStr().c_str(),
                            0500);
   ASSERT_EQ(0, mkdir_result);
 
   rlz_lib::SupplementaryBranding branding("TEST");
   EXPECT_FALSE(rlz_lib::RecordProductEvent(rlz_lib::TOOLBAR_NOTIFIER,
       rlz_lib::IE_DEFAULT_SEARCH, rlz_lib::INSTALL));
 }
 
 #endif