misc4: Use BUILDFLAG for OS checking

Use // BUILDFLAG(IS_XXX) instead of // OS_XXX.

Generated by `os_buildflag_migration.py` (https://crrev.com/c/3311983)
with modifications.

R=thakis@chromium.org

Bug: 1234043
Change-Id: Ibcf60c672ab3167ddad14656bff27378e67f3975
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3408124
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Auto-Submit: Xiaohan Wang <xhwang@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Owners-Override: Nico Weber <thakis@chromium.org>
Reviewed-by: Will Harris <wfh@chromium.org>
Commit-Queue: Will Harris <wfh@chromium.org>
Cr-Commit-Position: refs/heads/main@{#962181}

cc/trees/layer_tree_host_pixeltest_blending.cc

@@ -465,4 +465,4 @@ TEST_P(LayerTreeHostBlendingPixelTest,
 }  // namespace
 }  // namespace cc
 
-#endif  // OS_ANDROID
+#endif  // BUILDFLAG(IS_ANDROID)

cc/trees/layer_tree_host_pixeltest_filters.cc

@@ -1256,4 +1256,4 @@ TEST_P(BackdropFilterInvertTest, HiDpi) {
 }  // namespace
 }  // namespace cc
 
-#endif  // OS_ANDROID
+#endif  // BUILDFLAG(IS_ANDROID)

cc/trees/layer_tree_host_pixeltest_readback.cc

@@ -591,4 +591,4 @@ INSTANTIATE_TEST_SUITE_P(All,
 }  // namespace
 }  // namespace cc
 
-#endif  // OS_ANDROID
+#endif  // BUILDFLAG(IS_ANDROID)

cc/trees/layer_tree_host_pixeltest_scrollbars.cc

@@ -315,4 +315,4 @@ TEST_P(LayerTreeHostOverlayScrollbarsPixelTest, NinePatchScrollbarScaledDown) {
 }  // namespace
 }  // namespace cc
 
-#endif  // OS_ANDROID
+#endif  // BUILDFLAG(IS_ANDROID)

cc/trees/layer_tree_host_pixeltest_synchronous.cc

@@ -73,4 +73,4 @@ TEST_P(LayerTreeHostSynchronousPixelTest, OneContentLayerGpuRasterization) {
 }  // namespace
 }  // namespace cc
 
-#endif  // OS_ANDROID
+#endif  // BUILDFLAG(IS_ANDROID)

courgette/memory_allocator.cc

@@ -137,4 +137,4 @@ TempMapping* TempMapping::GetMappingFromPtr(void* mem) {
 
 }  // namespace courgette
 
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)

courgette/memory_allocator.h

@@ -262,7 +262,7 @@ class MemoryAllocator {
   }
 };
 
-#else  // OS_WIN
+#else  // BUILDFLAG(IS_WIN)
 
 // On Mac, Linux, we use a bare bones implementation that only does
 // heap allocations.
@@ -326,7 +326,7 @@ class MemoryAllocator {
   }
 };
 
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
 // Manages a growable buffer.  The buffer allocation is done by the
 // MemoryAllocator class.  This class will not throw exceptions so call sites

extensions/browser/api/app_window/app_window_apitest.cc

@@ -151,7 +151,7 @@ IN_PROC_BROWSER_TEST_F(AppWindowApiTest, MAYBE_AlphaEnabledHasPermissions) {
   if (!ui::win::IsAeroGlassEnabled()) {
     test_dir = kNoAlphaDir;
   }
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 #endif  // USE_AURA && !(OS_LINUX || IS_CHROMEOS_LACROS)
 
   EXPECT_TRUE(RunExtensionTest(test_dir, {.launch_as_platform_app = true}))

extensions/shell/app/shell_main_delegate.cc

@@ -176,7 +176,7 @@ void ShellMainDelegate::ZygoteStarting(
   nacl::AddNaClZygoteForkDelegates(delegates);
 #endif  // BUILDFLAG(ENABLE_NACL)
 }
-#endif  // OS_POSIX && !OS_MAC && !OS_ANDROID
+#endif  // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID)
 
 // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
 // of lacros-chrome is complete.

extensions/shell/test/shell_tests_main.cc

@@ -22,7 +22,7 @@ int main(int argc, char** argv) {
   // Load and pin user32.dll to avoid having to load it once tests start while
   // on the main thread loop where blocking calls are disallowed.
   base::win::PinUser32();
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
   extensions::AppShellTestLauncherDelegate launcher_delegate;
   return content::LaunchTests(&launcher_delegate, parallel_jobs, argc, argv);

headless/test/headless_test_launcher.cc

@@ -80,7 +80,7 @@ int main(int argc, char** argv) {
   // Load and pin user32.dll to avoid having to load it once tests start while
   // on the main thread loop where blocking calls are disallowed.
   base::win::PinUser32();
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
   // Setup a working test environment for the network service in case it's used.
   // Only create this object in the utility process, so that its members don't

net/base/network_interfaces_getifaddrs.cc

@@ -28,7 +28,7 @@
 #include <net/if_media.h>
 #include <netinet/in_var.h>
 #include <sys/ioctl.h>
-#endif  // !BUILDFLAG(IS_IOS)
+#endif
 
 #if BUILDFLAG(IS_ANDROID)
 #include "base/android/build_info.h"

net/http/http_auth_handler_negotiate_unittest.cc

@@ -84,7 +84,7 @@ class HttpAuthHandlerNegotiateTest : public PlatformTest,
     MockAuthLibrary::EnsureTestAccountExists();
 #else
     factory_->set_library(base::WrapUnique(auth_library_.get()));
-#endif  // !BUILDFLAG(IS_ANDROID)
+#endif  // BUILDFLAG(IS_ANDROID)
   }
 
 #if BUILDFLAG(IS_ANDROID)
@@ -187,7 +187,7 @@ class HttpAuthHandlerNegotiateTest : public PlatformTest,
                                           queries[i].expected_input_token,
                                           queries[i].output_token);
     }
-#endif  // !BUILDFLAG(IS_WIN)
+#endif  // BUILDFLAG(IS_WIN)
   }
 
 #if BUILDFLAG(IS_POSIX)

net/socket/socket_tag.h

@@ -13,7 +13,7 @@
 #include <stdint.h>
 #include <sys/types.h>
 #include <unistd.h>
-#endif  // BUILDFLAG(IS_ANDROID)
+#endif
 
 namespace net {
 

sandbox/linux/services/resource_limits_unittest.cc

@@ -24,7 +24,7 @@ namespace {
 #define MAYBE_NoFork DISABLE_ON_ASAN(NoFork)
 #else
 #define MAYBE_NoFork DISABLED_NoFork
-#endif  // OS_ANDROID
+#endif  // BUILDFLAG(IS_ANDROID)
 
 // Not being able to fork breaks LeakSanitizer, so disable on
 // all ASAN builds.

sandbox/policy/switches.cc

@@ -45,11 +45,11 @@ const char kXrCompositingSandbox[] = "xr_compositing";
 const char kIconReaderSandbox[] = "icon_reader";
 const char kMediaFoundationCdmSandbox[] = "mf_cdm";
 const char kWindowsSystemProxyResolverSandbox[] = "proxy_resolver_win";
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
 #if BUILDFLAG(IS_MAC)
 const char kMirroringSandbox[] = "mirroring";
-#endif  // OS_MAC
+#endif  // BUILDFLAG(IS_MAC)
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
 const char kHardwareVideoDecodingSandbox[] = "hardware_video_decoding";

sandbox/policy/switches.h

@@ -46,11 +46,11 @@ SANDBOX_POLICY_EXPORT extern const char kXrCompositingSandbox[];
 SANDBOX_POLICY_EXPORT extern const char kIconReaderSandbox[];
 SANDBOX_POLICY_EXPORT extern const char kMediaFoundationCdmSandbox[];
 SANDBOX_POLICY_EXPORT extern const char kWindowsSystemProxyResolverSandbox[];
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 
 #if BUILDFLAG(IS_MAC)
 SANDBOX_POLICY_EXPORT extern const char kMirroringSandbox[];
-#endif  // OS_MAC
+#endif  // BUILDFLAG(IS_MAC)
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
 SANDBOX_POLICY_EXPORT extern const char kHardwareVideoDecodingSandbox[];

sql/sandboxed_vfs_file.cc

@@ -455,7 +455,7 @@ int SandboxedVfsFile::DeviceCharacteristics() {
   // NOTE: SQLite's unix VFS attempts to detect the underlying filesystem and
   // sets some flags based on the result.
   return 0;
-#endif  // OS_WIN
+#endif  // BUILDFLAG(IS_WIN)
 }
 
 int SandboxedVfsFile::ShmMap(int page_index,