diff options
author | ivankr@chromium.org <ivankr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-29 14:00:12 +0000 |
---|---|---|
committer | ivankr@chromium.org <ivankr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-29 14:00:12 +0000 |
commit | 95b42e2745a2380a16112a059bd0e842d81f0c0a (patch) | |
tree | 8715285e587b94807bcc70cf135d99bdbec662fb /rlz/lib/rlz_lib_test.cc | |
parent | 1b14a45ac508a066cc3c060dd37327c3a13a6fda (diff) | |
download | chromium_src-95b42e2745a2380a16112a059bd0e842d81f0c0a.zip chromium_src-95b42e2745a2380a16112a059bd0e842d81f0c0a.tar.gz chromium_src-95b42e2745a2380a16112a059bd0e842d81f0c0a.tar.bz2 |
[cros] RlzValueStore made protected by a cross-process lock and not persisted over browser lifetime (like on Mac).
*) Moved RecursiveCrossProcessLock out of .mm file to a common _posix file.
*) Added static method to ImportantFileWriter that does blocking write on the current thread.
*) Dedicated RLZ thread gone, replaced back with shutdown-blocking worker pool.
BUG=157348,62328
Review URL: https://chromiumcodereview.appspot.com/11308196
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170179 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'rlz/lib/rlz_lib_test.cc')
-rw-r--r-- | rlz/lib/rlz_lib_test.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/rlz/lib/rlz_lib_test.cc b/rlz/lib/rlz_lib_test.cc index 338473b..86e659c 100644 --- a/rlz/lib/rlz_lib_test.cc +++ b/rlz/lib/rlz_lib_test.cc @@ -788,7 +788,7 @@ TEST_F(RlzLibTest, BrandingWithStatefulEvents) { EXPECT_STREQ("events=I7S", value); } -#if defined(OS_MACOSX) +#if defined(OS_POSIX) class ReadonlyRlzDirectoryTest : public RlzLibTestNoMachineState { protected: virtual void SetUp() OVERRIDE; @@ -799,7 +799,6 @@ void ReadonlyRlzDirectoryTest::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) { @@ -873,7 +872,7 @@ TEST_F(RlzLibTest, ConcurrentStoreAccessWithProcessExitsWhileLockHeld) { 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; @@ -881,7 +880,7 @@ TEST_F(RlzLibTest, LockAcquistionSucceedsButPlistCannotBeCreated) { // 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); |