mac/rlz: Remove an incorrect check

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).
 //
 // These tests require write access to HKLM and HKCU.
 //
 // The "GGLA" brand is used to test the normal code flow of the code, and the
 // "TEST" brand is used to test the supplementary brand code code flow.
 
 #include "base/eintr_wrapper.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "rlz/lib/rlz_lib.h"
 #include "rlz/test/rlz_test_helpers.h"
 
 #if defined(OS_WIN)
 #include <Windows.h>
 #include "rlz/win/lib/machine_deal.h"
+#elif defined(OS_MACOSX)
+namespace rlz_lib {
+namespace testing {
+std::string RlzPlistFilenameStr();
+}
+}

[Nico, 2012/08/21 20:43:44]

This is a bit gross, but rlz_value_store_mac.h can't be included here since it
relies on ObjC code.

[Mark Mentovai, 2012/08/21 20:59:29]

Nico wrote:
It doesn’t have to. There’s nothing Objective about that header except for the
pair of classes. Use this standard trick in the header:

#ifdef __OBJC__
@class NSDictionary;
@class NSMutableDictionary;
#else
class NSDictionary;
class NSMutableDictionary;
#endif

Then this file gets far less gross.

I notice that SetRlzStoreDirectory is declared in rlz/lib/rlz_value_store.h.
Maybe you should move it to rlz/mac/lib/rlz_value_store_mac.h too.

[Nico, 2012/08/21 21:05:03]

The included of scoped_nsobject.h needs to be conditional too, which in turn
requires the definition of the RlzValueStore class to be made conditional. If
you prefer that, I can do that, but that seemed pretty gross too.
Maybe I should move this new functions to rlz/lib/rlz_value_store.h instead. Did
that.

 #endif
 
 #if defined(RLZ_NETWORK_IMPLEMENTATION_CHROME_NET)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/threading/thread.h"
 #include "net/url_request/url_request_test_util.h"
 #endif
 
 
 class MachineDealCodeHelper
@@ skipping 826 matching lines @@
   int status;
   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) {
+  // 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(),
+                     0500);

[Mark Mentovai, 2012/08/21 20:59:29]

Bump this over to line up with the other argument.

+  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