Merge 152659 - mac/rlz: Remove an incorrect check

rlz/mac/lib/rlz_value_store_mac.mm

 // 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.
 
 #include "rlz/mac/lib/rlz_value_store_mac.h"
 
 #include "base/eintr_wrapper.h"
 #include "base/mac/foundation_util.h"
 #include "base/file_path.h"
 #include "base/logging.h"
@@ skipping 252 matching lines @@
   }
 
   locking_thread_ = pthread_self();
 
   // Try to acquire file lock.
   if (just_got_lock) {
     const int kMaxTimeoutMS = 5000;  // Matches windows.
     const int kSleepPerTryMS = 200;
 
     CHECK(file_lock_ == -1);
-    file_lock_ = open([lock_filename fileSystemRepresentation], O_CREAT, 0666);
+    file_lock_ = open([lock_filename fileSystemRepresentation],
+                      O_RDWR | O_CREAT,
+                      0666);
     if (file_lock_ == -1)
       return false;
 
     int flock_result = -1;
     int elapsed_ms = 0;
     while ((flock_result =
                HANDLE_EINTR(flock(file_lock_, LOCK_EX | LOCK_NB))) == -1 &&
            errno == EWOULDBLOCK &&
            elapsed_ms < kMaxTimeoutMS) {
       usleep(kSleepPerTryMS * 1000);
@@ skipping 63 matching lines @@
 // Returns the path of the rlz plist store, also creates the parent directory
 // path if it doesn't exist.
 NSString* RlzPlistFilename() {
   NSString* const kRlzFile = @"RlzStore.plist";
   return [CreateRlzDirectory() stringByAppendingPathComponent:kRlzFile];
 }
 
 // Returns the path of the rlz lock file, also creates the parent directory
 // path if it doesn't exist.
 NSString* RlzLockFilename() {
-  NSString* const kRlzFile = @"flockfile";
-  return [CreateRlzDirectory() stringByAppendingPathComponent:kRlzFile];
+  NSString* const kRlzLockfile = @"flockfile";
+  return [CreateRlzDirectory() stringByAppendingPathComponent:kRlzLockfile];
 }
 
 }  // namespace
 
 ScopedRlzValueStoreLock::ScopedRlzValueStoreLock() {
   bool got_distributed_lock =
       g_recursive_lock.TryGetCrossProcessLock(RlzLockFilename());
   // At this point, we hold the in-process lock, no matter the value of
   // |got_distributed_lock|.
 
   ++g_lock_depth;
 
   if (!got_distributed_lock) {
     // Give up. |store_| isn't set, which signals to callers that acquiring
     // the lock failed. |g_recursive_lock| will be released by the
     // destructor.
     CHECK(!g_store_object);
     return;
   }
 
   if (g_lock_depth > 1) {
-    // Reuse the already existing store object.
-    CHECK(g_store_object);
+    // Reuse the already existing store object. Note that it can be NULL when
+    // lock acquisition succeeded but the rlz data file couldn't be read.
     store_.reset(g_store_object);
     return;
   }
 
   CHECK(!g_store_object);
 
   NSString* plist = RlzPlistFilename();
 
   // Create an empty file if none exists yet.
   NSFileManager* manager = [NSFileManager defaultManager];
@@ skipping 50 matching lines @@
   [g_test_folder release];
   if (directory.empty()) {
     g_test_folder = nil;
   } else {
     // Not Unsafe on OS X.
     g_test_folder =
       [[NSString alloc] initWithUTF8String:directory.AsUTF8Unsafe().c_str()];
   }
 }
 
+std::string RlzPlistFilenameStr() {
+  @autoreleasepool {
+    return std::string([RlzPlistFilename() fileSystemRepresentation]);
+  }
+}
+
 }  // namespace testing
 
 }  // namespace rlz_lib