chromium/src
0
Fork 0
Code Activity

Migrate to OS_MAC and OS_APPLE in rlz

Browse Source 
Bug: 1105907
Change-Id: Ibe0ee8bb499bd257519ea4451c22630a9fed7765
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2325236
Reviewed-by: Roger Tawa <rogerta@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#793250}
This commit is contained in:
Avi Drissman
2020-07-30 17:51:54 +00:00
committed by Commit Bot
parent 9ea0532d24
commit c3ea3ed1f1
3 changed files with 5 additions and 5 deletions

4
rlz/lib/rlz_lib_test.cc

@ -573,7 +573,7 @@ TEST_F(RlzLibTest, SendFinancialPing) {
return;
#if defined(RLZ_NETWORK_IMPLEMENTATION_CHROME_NET)
#if defined(OS_MACOSX)
#if defined(OS_APPLE)
base::mac::ScopedNSAutoreleasePool pool;
#endif
@ -624,7 +624,7 @@ TEST_F(RlzLibTest, SendFinancialPingDuringShutdown) {
if (!rlz_lib::SupplementaryBranding::GetBrand().empty())
return;
#if defined(OS_MACOSX)
#if defined(OS_APPLE)
base::mac::ScopedNSAutoreleasePool pool;
#endif

4
rlz/lib/rlz_value_store.h

@ -19,7 +19,7 @@
#include "rlz/win/lib/lib_mutex.h"
#endif
#if defined(OS_MACOSX)
#if defined(OS_APPLE)
#include "base/mac/scoped_nsautorelease_pool.h"
#endif
@ -103,7 +103,7 @@ class ScopedRlzValueStoreLock {
std::unique_ptr<RlzValueStore> store_;
#if defined(OS_WIN)
LibMutex lock_;
#elif defined(OS_MACOSX)
#elif defined(OS_APPLE)
base::mac::ScopedNSAutoreleasePool autorelease_pool_;
#endif
};

2
rlz/test/rlz_test_helpers.cc

@ -130,7 +130,7 @@ void RlzLibTestNoMachineStateHelper::SetUp() {
#if defined(OS_WIN)
ASSERT_NO_FATAL_FAILURE(
InitializeRegistryOverridesForTesting(&override_manager_));
#elif defined(OS_MACOSX)
#elif defined(OS_APPLE)
base::mac::ScopedNSAutoreleasePool pool;
#endif // defined(OS_WIN)
#if defined(OS_POSIX)