Migrate to OS_MAC and OS_APPLE in services

Bug: 1105907 Change-Id: I2f68efa0536460fc31c764174efb9a0f23e53668 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2324213 Reviewed-by: Ken Rockot <rockot@google.com> Commit-Queue: Avi Drissman <avi@chromium.org> Cr-Commit-Position: refs/heads/master@{#793020}
FairyWorld · Jul 30, 2020 · be4c444 · be4c444
1 parent ea6244a
commit be4c444
Show file tree

Hide file tree

Showing 43 changed files with 84 additions and 84 deletions.
diff --git a/services/audio/service.cc b/services/audio/service.cc
@@ -24,7 +24,7 @@
 #include "services/audio/service_metrics.h"
 #include "services/audio/system_info.h"
 
-#if defined(OS_MACOSX)
+#if defined(OS_APPLE)
 #include "media/audio/mac/audio_device_listener_mac.h"
 #endif
 
@@ -158,7 +158,7 @@ void Service::BindTestingApi(
 
 void Service::InitializeDeviceMonitor() {
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
-#if defined(OS_MACOSX)
+#if defined(OS_APPLE)
   if (audio_device_listener_mac_)
     return;
 

diff --git a/services/audio/service.h b/services/audio/service.h
@@ -115,7 +115,7 @@ class Service : public mojom::AudioService {
   std::unique_ptr<AudioManagerAccessor> audio_manager_accessor_;
   const bool enable_remote_client_support_;
   std::unique_ptr<base::SystemMonitor> system_monitor_;
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
   std::unique_ptr<media::AudioDeviceListenerMac> audio_device_listener_mac_;
 #endif
   std::unique_ptr<SystemInfo> system_info_;

diff --git a/services/audio/sync_reader.cc b/services/audio/sync_reader.cc
@@ -54,7 +54,7 @@ SyncReader::SyncReader(
       renderer_callback_count_(0),
       renderer_missed_callback_count_(0),
       trailing_renderer_missed_callback_count_(0),
-#if defined(OS_MACOSX) || defined(OS_CHROMEOS)
+#if defined(OS_MAC) || defined(OS_CHROMEOS)
       maximum_wait_time_(params.GetBufferDuration() / 2),
 #else
       // TODO(dalecurtis): Investigate if we can reduce this on all platforms.

diff --git a/services/device/device_service.cc b/services/device/device_service.cc
@@ -126,10 +126,10 @@ DeviceService::DeviceService(
       wake_lock_provider_(file_task_runner_, wake_lock_context_callback_) {
   receivers_.Add(this, std::move(receiver));
 #if (defined(OS_LINUX) && defined(USE_UDEV)) || defined(OS_WIN) || \
-    defined(OS_MACOSX)
+    defined(OS_MAC)
   serial_port_manager_ = std::make_unique<SerialPortManagerImpl>(
       io_task_runner_, base::ThreadTaskRunnerHandle::Get());
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
   // On macOS the SerialDeviceEnumerator needs to run on the UI thread so that
   // it has access to a CFRunLoop where it can register a notification source.
   serial_port_manager_task_runner_ = base::ThreadTaskRunnerHandle::Get();
@@ -156,7 +156,7 @@ DeviceService::~DeviceService() {
   device::BatteryStatusService::GetInstance()->Shutdown();
 #endif
 #if (defined(OS_LINUX) && defined(USE_UDEV)) || defined(OS_WIN) || \
-    defined(OS_MACOSX)
+    defined(OS_MAC)
   serial_port_manager_task_runner_->DeleteSoon(FROM_HERE,
                                                std::move(serial_port_manager_));
 #endif
@@ -312,7 +312,7 @@ void DeviceService::BindSensorProvider(
 void DeviceService::BindSerialPortManager(
     mojo::PendingReceiver<mojom::SerialPortManager> receiver) {
 #if (defined(OS_LINUX) && defined(USE_UDEV)) || defined(OS_WIN) || \
-    defined(OS_MACOSX)
+    defined(OS_MAC)
   DCHECK(serial_port_manager_task_runner_);
   serial_port_manager_task_runner_->PostTask(
       FROM_HERE, base::BindOnce(&SerialPortManagerImpl::Bind,

diff --git a/services/device/device_service.h b/services/device/device_service.h
@@ -235,7 +235,7 @@ class DeviceService : public mojom::DeviceService {
 #endif
 
 #if (defined(OS_LINUX) && defined(USE_UDEV)) || defined(OS_WIN) || \
-    defined(OS_MACOSX)
+    defined(OS_MAC)
   // Requests for the SerialPortManager interface must be bound to
   // |serial_port_manager_| on |serial_port_manager_task_runner_| and it will
   // be destroyed on that sequence.

diff --git a/services/device/generic_sensor/platform_sensor_provider.cc b/services/device/generic_sensor/platform_sensor_provider.cc
@@ -4,7 +4,7 @@
 
 #include "services/device/generic_sensor/platform_sensor_provider.h"
 
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
 #include "services/device/generic_sensor/platform_sensor_provider_mac.h"
 #elif defined(OS_ANDROID)
 #include "services/device/generic_sensor/platform_sensor_provider_android.h"
@@ -23,7 +23,7 @@ namespace device {
 
 // static
 std::unique_ptr<PlatformSensorProvider> PlatformSensorProvider::Create() {
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
   return std::make_unique<PlatformSensorProviderMac>();
 #elif defined(OS_ANDROID)
   return std::make_unique<PlatformSensorProviderAndroid>();

diff --git a/services/device/geolocation/geolocation_provider_impl.cc b/services/device/geolocation/geolocation_provider_impl.cc
@@ -172,7 +172,7 @@ void GeolocationProviderImpl::OnClientsChanged() {
   } else {
     if (!IsRunning()) {
       base::Thread::Options options;
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
       options.message_pump_type = base::MessagePumpType::NS_RUNLOOP;
 #endif
       StartWithOptions(options);

diff --git a/services/device/hid/hid_connection_impl_unittest.cc b/services/device/hid/hid_connection_impl_unittest.cc
@@ -18,7 +18,7 @@ namespace device {
 
 namespace {
 
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
 const uint64_t kTestDeviceId = 123;
 #elif defined(OS_WIN)
 const wchar_t* kTestDeviceId = L"123";

diff --git a/services/device/hid/hid_device_info.h b/services/device/hid/hid_device_info.h
@@ -19,7 +19,7 @@
 
 namespace device {
 
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
 typedef uint64_t HidPlatformDeviceId;
 #elif defined(OS_WIN)
 typedef std::wstring HidPlatformDeviceId;

diff --git a/services/device/hid/hid_manager_unittest.cc b/services/device/hid/hid_manager_unittest.cc
@@ -22,7 +22,7 @@ namespace device {
 
 namespace {
 
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
 const uint64_t kTestDeviceIds[] = {0, 1, 2};
 #elif defined(OS_WIN)
 const wchar_t* const kTestDeviceIds[] = {L"0", L"1", L"2"};

diff --git a/services/device/hid/hid_service.cc b/services/device/hid/hid_service.cc
@@ -16,7 +16,7 @@
 
 #if defined(OS_LINUX) && defined(USE_UDEV)
 #include "services/device/hid/hid_service_linux.h"
-#elif defined(OS_MACOSX)
+#elif defined(OS_MAC)
 #include "services/device/hid/hid_service_mac.h"
 #elif defined(OS_WIN)
 #include "services/device/hid/hid_service_win.h"
@@ -36,7 +36,7 @@ constexpr base::TaskTraits HidService::kBlockingTaskTraits;
 std::unique_ptr<HidService> HidService::Create() {
 #if defined(OS_LINUX) && defined(USE_UDEV)
   return base::WrapUnique(new HidServiceLinux());
-#elif defined(OS_MACOSX)
+#elif defined(OS_MAC)
   return base::WrapUnique(new HidServiceMac());
 #elif defined(OS_WIN)
   return base::WrapUnique(new HidServiceWin());

diff --git a/services/device/public/cpp/hid/hid_device_filter_unittest.cc b/services/device/public/cpp/hid/hid_device_filter_unittest.cc
@@ -15,7 +15,7 @@ namespace device {
 
 namespace {
 
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
 const uint64_t kTestDeviceId = 42;
 #elif defined(OS_WIN)
 const wchar_t* kTestDeviceId = L"device1";

diff --git a/services/device/serial/serial_device_enumerator.cc b/services/device/serial/serial_device_enumerator.cc
@@ -11,7 +11,7 @@
 
 #if defined(OS_LINUX)
 #include "services/device/serial/serial_device_enumerator_linux.h"
-#elif defined(OS_MACOSX)
+#elif defined(OS_MAC)
 #include "services/device/serial/serial_device_enumerator_mac.h"
 #elif defined(OS_WIN)
 #include "services/device/serial/serial_device_enumerator_win.h"
@@ -24,7 +24,7 @@ std::unique_ptr<SerialDeviceEnumerator> SerialDeviceEnumerator::Create(
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
 #if defined(OS_LINUX)
   return SerialDeviceEnumeratorLinux::Create();
-#elif defined(OS_MACOSX)
+#elif defined(OS_MAC)
   return std::make_unique<SerialDeviceEnumeratorMac>();
 #elif defined(OS_WIN)
   return std::make_unique<SerialDeviceEnumeratorWin>(std::move(ui_task_runner));
@@ -66,7 +66,7 @@ base::Optional<base::FilePath> SerialDeviceEnumerator::GetPathFromToken(
   if (it == ports_.end())
     return base::nullopt;
 
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
   if (use_alternate_path)
     return it->second->alternate_path;
 #endif

diff --git a/services/device/serial/serial_io_handler_posix.cc b/services/device/serial/serial_io_handler_posix.cc
@@ -36,7 +36,7 @@ struct termios2 {
 
 #endif  // defined(OS_LINUX)
 
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
 #include <IOKit/serial/ioss.h>
 #endif
 
@@ -66,7 +66,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* speed) {
     BITRATE_TO_SPEED_CASE(9600)
     BITRATE_TO_SPEED_CASE(19200)
     BITRATE_TO_SPEED_CASE(38400)
-#if !defined(OS_MACOSX)
+#if !defined(OS_MAC)
     BITRATE_TO_SPEED_CASE(57600)
     BITRATE_TO_SPEED_CASE(115200)
     BITRATE_TO_SPEED_CASE(230400)
@@ -179,7 +179,7 @@ bool SerialIoHandlerPosix::ConfigurePortImpl() {
 
   DCHECK(options().bitrate);
   speed_t bitrate_opt = B0;
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
   bool need_iossiospeed = false;
 #endif
   if (BitrateToSpeedConstant(options().bitrate, &bitrate_opt)) {
@@ -196,7 +196,7 @@ bool SerialIoHandlerPosix::ConfigurePortImpl() {
     config.c_cflag &= ~CBAUD;
     config.c_cflag |= CBAUDEX;
     config.c_ispeed = config.c_ospeed = options().bitrate;
-#elif defined(OS_MACOSX)
+#elif defined(OS_MAC)
     // cfsetispeed and cfsetospeed sometimes work for custom baud rates on OS
     // X but the IOSSIOSPEED ioctl is more reliable but has to be done after
     // the rest of the port parameters are set or else it will be overwritten.
@@ -273,7 +273,7 @@ bool SerialIoHandlerPosix::ConfigurePortImpl() {
     return false;
   }
 
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
   if (need_iossiospeed) {
     speed_t bitrate = options().bitrate;
     if (ioctl(file().GetPlatformFile(), IOSSIOSPEED, &bitrate) == -1) {

diff --git a/services/device/usb/usb_service.cc b/services/device/usb/usb_service.cc
@@ -54,7 +54,7 @@ std::unique_ptr<UsbService> UsbService::Create() {
     return base::WrapUnique(new UsbServiceWin());
   else
     return base::WrapUnique(new UsbServiceImpl());
-#elif defined(OS_MACOSX)
+#elif defined(OS_MAC)
   return base::WrapUnique(new UsbServiceImpl());
 #else
   return nullptr;

diff --git a/services/network/network_service.cc b/services/network/network_service.cc
@@ -680,7 +680,7 @@ void NetworkService::SetCryptConfig(mojom::CryptConfigPtr crypt_config) {
 }
 #endif
 
-#if defined(OS_WIN) || (defined(OS_MACOSX) && !defined(OS_IOS))
+#if defined(OS_WIN) || defined(OS_MAC)
 void NetworkService::SetEncryptionKey(const std::string& encryption_key) {
   OSCrypt::SetRawEncryptionKey(encryption_key);
 }

diff --git a/services/network/network_service.h b/services/network/network_service.h
@@ -196,7 +196,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   void SetCryptConfig(mojom::CryptConfigPtr crypt_config) override;
 #endif
-#if defined(OS_WIN) || (defined(OS_MACOSX) && !defined(OS_IOS))
+#if defined(OS_WIN) || defined(OS_MAC)
   void SetEncryptionKey(const std::string& encryption_key) override;
 #endif
   void AddCorbExceptionForPlugin(int32_t process_id) override;

diff --git a/services/network/public/cpp/cert_verifier/trial_comparison_cert_verifier_mojo.cc b/services/network/public/cpp/cert_verifier/trial_comparison_cert_verifier_mojo.cc
@@ -13,7 +13,7 @@
 #include "net/der/encode_values.h"
 #include "net/der/parse_values.h"
 
-#if defined(OS_MACOSX) && !defined(OS_IOS)
+#if defined(OS_MAC)
 #include "net/cert/cert_verify_proc_mac.h"
 #include "net/cert/internal/trust_store_mac.h"
 #endif
@@ -74,7 +74,7 @@ void TrialComparisonCertVerifierMojo::OnSendTrialReport(
     const net::CertVerifyResult& trial_result) {
   network::mojom::CertVerifierDebugInfoPtr debug_info =
       network::mojom::CertVerifierDebugInfo::New();
-#if defined(OS_MACOSX) && !defined(OS_IOS)
+#if defined(OS_MAC)
   auto* mac_platform_debug_info =
       net::CertVerifyProcMac::ResultDebugData::Get(&primary_result);
   if (mac_platform_debug_info) {

diff --git a/services/network/public/cpp/cert_verifier/trial_comparison_cert_verifier_mojo_unittest.cc b/services/network/public/cpp/cert_verifier/trial_comparison_cert_verifier_mojo_unittest.cc
@@ -15,7 +15,7 @@
 #include "net/test/test_data_directory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#if defined(OS_MACOSX) && !defined(OS_IOS)
+#if defined(OS_MAC)
 #include "net/cert/cert_verify_proc_mac.h"
 #include "net/cert/internal/trust_store_mac.h"
 #endif
@@ -104,7 +104,7 @@ TEST(TrialComparisonCertVerifierMojoTest, SendReportDebugInfo) {
   net::CertVerifyResult trial_result;
   trial_result.verified_cert = chain2;
 
-#if defined(OS_MACOSX) && !defined(OS_IOS)
+#if defined(OS_MAC)
   constexpr uint32_t kExpectedTrustResult = 4;
   constexpr int32_t kExpectedResultCode = -12345;
   std::vector<net::CertVerifyProcMac::ResultDebugData::CertEvidenceInfo>
@@ -169,7 +169,7 @@ TEST(TrialComparisonCertVerifierMojoTest, SendReportDebugInfo) {
             std::string(report.sct_list.begin(), report.sct_list.end()));
 
   ASSERT_TRUE(report.debug_info);
-#if defined(OS_MACOSX) && !defined(OS_IOS)
+#if defined(OS_MAC)
   ASSERT_TRUE(report.debug_info->mac_platform_debug_info);
   EXPECT_EQ(kExpectedTrustResult,
             report.debug_info->mac_platform_debug_info->trust_result);

diff --git a/services/network/public/cpp/features.cc b/services/network/public/cpp/features.cc
@@ -126,7 +126,7 @@ const base::Feature kSplitAuthCacheByNetworkIsolationKey{
 // Enable usage of hardcoded DoH upgrade mapping for use in automatic mode.
 const base::Feature kDnsOverHttpsUpgrade {
   "DnsOverHttpsUpgrade",
-#if defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_ANDROID) || \
+#if defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_ANDROID) || \
     defined(OS_WIN)
       base::FEATURE_ENABLED_BY_DEFAULT
 #else

diff --git a/services/network/tcp_bound_socket_unittest.cc b/services/network/tcp_bound_socket_unittest.cc
@@ -226,7 +226,7 @@ TEST_F(TCPBoundSocketTest, BindError) {
 //
 // Don't run on Apple platforms because this pattern ends in a connect timeout
 // on OSX (after 25+ seconds) instead of connection refused.
-#if !defined(OS_MACOSX) && !defined(OS_IOS)
+#if !defined(OS_APPLE)
 TEST_F(TCPBoundSocketTest, ConnectError) {
   mojo::Remote<mojom::TCPBoundSocket> bound_socket1;
   net::IPEndPoint bound_address1;
@@ -248,7 +248,7 @@ TEST_F(TCPBoundSocketTest, ConnectError) {
                     &connected_socket, mojo::NullRemote(),
                     &client_socket_receive_handle, &client_socket_send_handle));
 }
-#endif  // !defined(OS_MACOSX) && !defined(OS_IOS)
+#endif  // !defined(OS_APPLE)
 
 // Test listen failure.
 
@@ -258,7 +258,7 @@ TEST_F(TCPBoundSocketTest, ConnectError) {
 //
 // Apple platforms don't allow binding multiple TCP sockets to the same port
 // even with SO_REUSEADDR enabled.
-#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_IOS)
+#if !defined(OS_WIN) && !defined(OS_APPLE)
 TEST_F(TCPBoundSocketTest, ListenError) {
   // Bind a socket.
   mojo::Remote<mojom::TCPBoundSocket> bound_socket1;
@@ -285,7 +285,7 @@ TEST_F(TCPBoundSocketTest, ListenError) {
   EXPECT_TRUE(result == net::ERR_ADDRESS_IN_USE ||
               result == net::ERR_INVALID_ARGUMENT);
 }
-#endif  // !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_IOS)
+#endif  // !defined(OS_WIN) && !defined(OS_APPLE)
 
 // Test the case bind succeeds, and transfer some data.
 TEST_F(TCPBoundSocketTest, ReadWrite) {

diff --git a/services/network/tcp_socket_unittest.cc b/services/network/tcp_socket_unittest.cc
@@ -38,7 +38,7 @@
 #include "services/network/tcp_server_socket.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#if defined(OS_MACOSX) && !defined(OS_IOS)
+#if defined(OS_MAC)
 #include "base/mac/mac_util.h"
 #endif
 
@@ -575,7 +575,7 @@ TEST_F(TCPSocketTest, SocketClosed) {
   int result = observer()->WaitForWriteError();
   bool result_ok = result == net::ERR_CONNECTION_RESET ||
                    result == net::ERR_CONNECTION_ABORTED;
-#if defined(OS_MACOSX) && !defined(OS_IOS)
+#if defined(OS_MAC)
   // On some macOS kernels, send() on a closing TCP socket can return
   // EPROTOTYPE, which is unknown to the net stack and gets mapped to
   // net::ERR_FAILED.

diff --git a/services/preferences/tracked/device_id_unittest.cc b/services/preferences/tracked/device_id_unittest.cc
@@ -12,7 +12,7 @@ TEST(GetDeterministicMachineSpecificIdTest, IsDeterministic) {
   std::string second_machine_id;
 
   const MachineIdStatus kExpectedStatus =
-#if defined(OS_WIN) || (defined(OS_MACOSX) && !defined(OS_IOS))
+#if defined(OS_WIN) || defined(OS_MAC)
       MachineIdStatus::SUCCESS;
 #else
       MachineIdStatus::NOT_IMPLEMENTED;

diff --git a/services/resource_coordinator/memory_instrumentation/coordinator_impl.cc b/services/resource_coordinator/memory_instrumentation/coordinator_impl.cc
@@ -29,7 +29,7 @@
 #include "services/resource_coordinator/public/mojom/memory_instrumentation/constants.mojom.h"
 #include "services/resource_coordinator/public/mojom/memory_instrumentation/memory_instrumentation.mojom.h"
 
-#if defined(OS_MACOSX) && !defined(OS_IOS)
+#if defined(OS_MAC)
 #include "base/mac/mac_util.h"
 #endif