From edf57482697bfb2777c28ab56977f5c448fa5c2d Mon Sep 17 00:00:00 2001
From: Devon Loehr <dloehr@google.com>
Date: Tue, 6 May 2025 14:23:23 -0700
Subject: [PATCH] Exported things should always be visible
This changes our COMPONENT_EXPORT macros to make the things they export
visible all the time on non-windows, rather than making them visible in
the named component only. This avoids subtle bugs where things defined
in multiple components end up with one copy per component, only one of
which is visible, and so the linker doesn't know it's supposed to dedup
them.
Some, but not all, of these issues are detected by the new clang warning
-Wunique-object-duplication. This change addresses some instances of that
warning firing on chromium code, but not all. Conversely, there are likely
instances which the warning does not catch, which are fixed by this CL.
Bug: 368047728
Change-Id: I829a9bd84e57e3c7d80ec33aea0408951019bde7
AX-Relnotes: n/a.
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6264795
Owners-Override: Avi Drissman <avi@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Devon Loehr <dloehr@google.com>
Cr-Commit-Position: refs/heads/main@{#1456614}
---
ash/app_list/model/app_list_model_export.h | 4 ----
ash/app_menu/app_menu_export.h | 4 ----
ash/ash_export.h | 4 ----
ash/keyboard/ui/keyboard_export.h | 4 ----
.../partition_alloc_base/component_export.h | 2 +-
base/base_export.h | 4 ----
base/component_export.h | 2 +-
base/i18n/base_i18n_export.h | 4 ----
base/test/test_proto_loader.h | 4 ----
base/test/test_trace_processor_export.h | 6 ------
build/rust/tests/bindgen_static_fns_test/lib.h | 6 +-----
build/rust/tests/bindgen_test/lib.h | 6 +-----
cc/animation/animation_export.h | 4 ----
cc/base/base_export.h | 4 ----
cc/cc_export.h | 4 ----
cc/debug/debug_export.h | 4 ----
cc/mojo_embedder/mojo_embedder_export.h | 4 ----
cc/paint/paint_export.h | 4 ----
chrome/browser/ui/views/chrome_views_export.h | 4 ----
chrome/browser/vr/vr_base_export.h | 4 ----
chrome/browser/vr/vr_export.h | 4 ----
chrome/browser/vr/vr_ui_export.h | 4 ----
chromeos/ash/experiences/arc/arc_export.h | 4 ----
chromeos/chromeos_export.h | 4 ----
.../captive_portal/core/captive_portal_export.h | 4 ----
components/capture_mode/capture_mode_export.h | 4 ----
components/cast/cast_component_export.h | 5 ++---
components/cbor/cbor_export.h | 4 ----
components/crash/core/common/crash_export.h | 4 ----
.../device_event_log/device_event_log_export.h | 8 --------
.../common/discardable_memory_export.h | 4 ----
.../domain_reliability/domain_reliability_export.h | 4 ----
components/download/public/common/download_export.h | 4 ----
components/drive/drive_export.h | 5 -----
components/gcm_driver/common/gcm_driver_export.h | 4 ----
components/gwp_asan/client/export.h | 4 ----
.../keyed_service/core/keyed_service_export.h | 4 ----
components/login/login_export.h | 8 --------
components/metal_util/metal_util_export.h | 4 ----
components/ownership/ownership_export.h | 4 ----
components/policy/policy_export.h | 8 --------
components/policy/proto/policy_proto_export.h | 13 -------------
components/prefs/prefs_export.h | 4 ----
components/proxy_config/proxy_config_export.h | 4 ----
components/quirks/quirks_export.h | 4 ----
.../app_shim/remote_cocoa_app_shim_export.h | 4 ----
.../browser/remote_cocoa_browser_export.h | 4 ----
components/session_manager/session_manager_export.h | 4 ----
components/sessions/core/sessions_export.h | 4 ----
components/tracing/tracing_export.h | 4 ----
components/ui_devtools/devtools_export.h | 4 ----
components/url_matcher/url_matcher_export.h | 4 ----
components/user_manager/user_manager_export.h | 4 ----
components/user_prefs/user_prefs_export.h | 4 ----
components/viz/client/viz_client_export.h | 4 ----
components/viz/common/viz_common_export.h | 4 ----
.../viz/common/viz_metal_context_provider_export.h | 4 ----
components/viz/host/viz_host_export.h | 4 ----
components/viz/service/viz_service_export.h | 4 ----
components/web_modal/web_modal_export.h | 4 ----
components/webdata/common/webdata_export.h | 4 ----
components/wifi/wifi_export.h | 4 ----
content/common/content_export.h | 4 ----
crypto/crypto_export.h | 4 ----
dbus/dbus_export.h | 8 --------
device/base/device_base_export.h | 4 ----
device/bluetooth/bluetooth_export.h | 4 ----
device/gamepad/gamepad_export.h | 4 ----
device/gamepad/public/cpp/gamepad_features_export.h | 4 ----
device/vr/vr_export.h | 4 ----
extensions/common/extensions_export.h | 4 ----
fuchsia_web/webengine/web_engine_export.h | 4 ----
gin/gin_export.h | 4 ----
google_apis/gcm/base/gcm_export.h | 4 ----
gpu/command_buffer/client/gles2_c_lib_export.h | 4 ----
gpu/command_buffer/client/gles2_impl_export.h | 4 ----
gpu/command_buffer/client/webgpu_export.h | 4 ----
gpu/command_buffer/common/gles2_utils_export.h | 4 ----
gpu/gpu_export.h | 4 ----
gpu/gpu_gles2_export.h | 4 ----
gpu/gpu_util_export.h | 4 ----
gpu/ipc/gl_in_process_context_export.h | 4 ----
gpu/ipc/service/gpu_ipc_service_export.h | 4 ----
gpu/raster_export.h | 4 ----
headless/public/headless_export.h | 4 ----
ios/web_view/public/cwv_export.h | 4 ----
ipc/ipc_message_support_export.h | 4 ----
media/base/media_shmem_export.h | 4 ----
media/capture/capture_export.h | 4 ----
media/gpu/media_gpu_export.h | 4 ----
media/midi/midi_export.h | 4 ----
mojo/core/system_impl_export.h | 4 ----
mojo/public/c/system/system_export.h | 4 ----
.../cpp/bindings/tests/mojo_test_blink_export.h | 4 ----
mojo/public/cpp/bindings/tests/mojo_test_export.h | 4 ----
net/base/net_export.h | 5 -----
ppapi/host/ppapi_host_export.h | 4 ----
ppapi/proxy/ppapi_proxy_export.h | 4 ----
ppapi/shared_impl/ppapi_shared_export.h | 4 ----
ppapi/thunk/ppapi_thunk_export.h | 4 ----
remoting/host/host_export.h | 4 ----
sandbox/mac/seatbelt_export.h | 4 ----
sandbox/policy/export.h | 4 ----
sandbox/sandbox_export.h | 4 ----
services/device/public/cpp/device_features_export.h | 4 ----
services/metrics/public/cpp/metrics_export.h | 4 ----
services/service_manager/public/cpp/export.h | 4 ----
skia/ext/switches_export.h | 4 ----
.../accelerated_widget_mac_export.h | 4 ----
ui/accessibility/ax_base_export.h | 3 +--
ui/accessibility/ax_export.h | 2 +-
ui/android/ui_android_export.h | 8 --------
ui/aura/aura_export.h | 4 ----
ui/aura_extra/aura_extra_export.h | 4 ----
ui/chromeos/ui_chromeos_export.h | 4 ----
ui/compositor/compositor_export.h | 4 ----
ui/display/display_export.h | 4 ----
ui/display/manager/display_manager_export.h | 4 ----
ui/display/types/display_types_export.h | 4 ----
ui/display/util/display_util_export.h | 4 ----
ui/events/devices/events_devices_export.h | 4 ----
ui/events/devices/x11/events_devices_x11_export.h | 4 ----
ui/events/events_base_export.h | 4 ----
ui/events/events_export.h | 4 ----
.../gesture_detection/gesture_detection_export.h | 4 ----
ui/events/keycodes/keycodes_x_export.h | 4 ----
ui/events/x/events_x_export.h | 4 ----
ui/file_manager/file_manager_export.h | 4 ----
ui/gfx/animation/animation_export.h | 4 ----
.../animation/keyframe/keyframe_animation_export.h | 4 ----
ui/gfx/codec/codec_export.h | 4 ----
ui/gfx/color_space_export.h | 4 ----
ui/gfx/gfx_skia_export.h | 4 ----
ui/gfx/ipc/buffer_types/gfx_ipc_export.h | 4 ----
ui/gfx/ipc/color/gfx_ipc_color_export.h | 4 ----
ui/gfx/ipc/geometry/gfx_ipc_geometry_export.h | 4 ----
ui/gfx/ipc/gfx_ipc_export.h | 4 ----
ui/gfx/ipc/skia/gfx_skia_ipc_export.h | 4 ----
ui/gfx/range/gfx_range_export.h | 4 ----
ui/gfx/switches_export.h | 4 ----
ui/gl/gl_export.h | 4 ----
ui/gl/init/gl_init_export.h | 4 ----
ui/message_center/message_center_export.h | 4 ----
.../public/cpp/message_center_public_export.h | 4 ----
ui/platform_window/stub/stub_window_export.h | 4 ----
ui/platform_window/win/win_window_export.h | 4 ----
ui/shell_dialogs/shell_dialogs_export.h | 4 ----
ui/snapshot/snapshot_export.h | 4 ----
ui/surface/surface_export.h | 4 ----
ui/touch_selection/ui_touch_selection_export.h | 4 ----
ui/views/controls/webview/webview_export.h | 4 ----
ui/views/examples/views_examples_export.h | 4 ----
ui/views/views_export.h | 4 ----
.../views_content_client_export.h | 4 ----
ui/web_dialogs/web_dialogs_export.h | 4 ----
ui/wm/public/wm_public_export.h | 4 ----
url/ipc/url_ipc_export.h | 4 ----
157 files changed, 8 insertions(+), 651 deletions(-)
diff --git a/ash/app_list/model/app_list_model_export.h b/ash/app_list/model/app_list_model_export.h
index d3ee4be15c9f9..c3778318a0259 100644
--- a/ash/app_list/model/app_list_model_export.h
+++ b/ash/app_list/model/app_list_model_export.h
@@ -10,11 +10,7 @@
#if defined(COMPONENT_BUILD)
-#if defined(APP_LIST_MODEL_IMPLEMENTATION)
#define APP_LIST_MODEL_EXPORT __attribute__((visibility("default")))
-#else
-#define APP_LIST_MODEL_EXPORT
-#endif
#else // defined(COMPONENT_BUILD)
#define APP_LIST_MODEL_EXPORT
diff --git a/ash/app_menu/app_menu_export.h b/ash/app_menu/app_menu_export.h
index 3ba9e92f1f8e1..3065e2a19539b 100644
--- a/ash/app_menu/app_menu_export.h
+++ b/ash/app_menu/app_menu_export.h
@@ -10,11 +10,7 @@
#if defined(COMPONENT_BUILD)
-#if defined(APP_MENU_IMPLEMENTATION)
#define APP_MENU_EXPORT __attribute__((visibility("default")))
-#else
-#define APP_MENU_EXPORT
-#endif
#else // defined(COMPONENT_BUILD)
#define APP_MENU_EXPORT
diff --git a/ash/ash_export.h b/ash/ash_export.h
index 8e3cd9c4ecd64..bc2e7bec3164b 100644
--- a/ash/ash_export.h
+++ b/ash/ash_export.h
@@ -10,11 +10,7 @@
#if defined(COMPONENT_BUILD)
-#if defined(ASH_IMPLEMENTATION)
#define ASH_EXPORT __attribute__((visibility("default")))
-#else
-#define ASH_EXPORT
-#endif
#else // defined(COMPONENT_BUILD)
#define ASH_EXPORT
diff --git a/ash/keyboard/ui/keyboard_export.h b/ash/keyboard/ui/keyboard_export.h
index cedeeecfff867..a0e455c86422e 100644
--- a/ash/keyboard/ui/keyboard_export.h
+++ b/ash/keyboard/ui/keyboard_export.h
@@ -18,11 +18,7 @@
#endif // defined(KEYBOARD_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(KEYBOARD_IMPLEMENTATION)
#define KEYBOARD_EXPORT __attribute__((visibility("default")))
-#else
-#define KEYBOARD_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/component_export.h b/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/component_export.h
index 36c74fa226278..94a565b834212 100644
--- a/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/component_export.h
+++ b/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_base/component_export.h
@@ -39,7 +39,7 @@
#define PA_COMPONENT_IMPORT_ANNOTATION __declspec(dllimport)
#else // defined(WIN32)
#define PA_COMPONENT_EXPORT_ANNOTATION __attribute__((visibility("default")))
-#define PA_COMPONENT_IMPORT_ANNOTATION
+#define PA_COMPONENT_IMPORT_ANNOTATION __attribute__((visibility("default")))
#endif // defined(WIN32)
#else // defined(COMPONENT_BUILD)
#define PA_COMPONENT_EXPORT_ANNOTATION
diff --git a/base/base_export.h b/base/base_export.h
index 1df53544fda6b..dd4c5912e5dc0 100644
--- a/base/base_export.h
+++ b/base/base_export.h
@@ -15,11 +15,7 @@
#endif // defined(BASE_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(BASE_IMPLEMENTATION)
#define BASE_EXPORT __attribute__((visibility("default")))
-#else
-#define BASE_EXPORT
-#endif // defined(BASE_IMPLEMENTATION)
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/base/component_export.h b/base/component_export.h
index 0c70e8de3e65c..649cf4517ad2a 100644
--- a/base/component_export.h
+++ b/base/component_export.h
@@ -39,7 +39,7 @@
#define COMPONENT_IMPORT_ANNOTATION __declspec(dllimport)
#else // defined(WIN32)
#define COMPONENT_EXPORT_ANNOTATION __attribute__((visibility("default")))
-#define COMPONENT_IMPORT_ANNOTATION
+#define COMPONENT_IMPORT_ANNOTATION __attribute__((visibility("default")))
#endif // defined(WIN32)
#else // defined(COMPONENT_BUILD)
#define COMPONENT_EXPORT_ANNOTATION
diff --git a/base/i18n/base_i18n_export.h b/base/i18n/base_i18n_export.h
index 72afb46cad821..ced66202d4264 100644
--- a/base/i18n/base_i18n_export.h
+++ b/base/i18n/base_i18n_export.h
@@ -15,11 +15,7 @@
#endif // defined(BASE_I18N_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(BASE_I18N_IMPLEMENTATION)
#define BASE_I18N_EXPORT __attribute__((visibility("default")))
-#else
-#define BASE_I18N_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/base/test/test_proto_loader.h b/base/test/test_proto_loader.h
index 0cc7a9edfa782..671464dccbd93 100644
--- a/base/test/test_proto_loader.h
+++ b/base/test/test_proto_loader.h
@@ -23,11 +23,7 @@ namespace base {
#endif // defined(PROTO_TEST_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(PROTO_TEST_IMPLEMENTATION)
#define PROTO_TEST_EXPORT __attribute__((visibility("default")))
-#else
-#define PROTO_TEST_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
#define PROTO_TEST_EXPORT
diff --git a/base/test/test_trace_processor_export.h b/base/test/test_trace_processor_export.h
index f5191b804bc07..94b5a2ab1e751 100644
--- a/base/test/test_trace_processor_export.h
+++ b/base/test/test_trace_processor_export.h
@@ -14,13 +14,7 @@
#endif // defined(TEST_TRACE_PROCESSOR_IMPL)
#else // defined(WIN32)
-
-#if defined(TEST_TRACE_PROCESSOR_IMPL)
#define TEST_TRACE_PROCESSOR_EXPORT __attribute__((visibility("default")))
-#else
-#define TEST_TRACE_PROCESSOR_EXPORT
-#endif // defined(TEST_TRACE_PROCESSOR_IMPL)
-
#endif // defined(WIN32)
#endif // BASE_TEST_TEST_TRACE_PROCESSOR_EXPORT_H_
diff --git a/build/rust/tests/bindgen_static_fns_test/lib.h b/build/rust/tests/bindgen_static_fns_test/lib.h
index eb070afede334..bb1abdd756b4d 100644
--- a/build/rust/tests/bindgen_static_fns_test/lib.h
+++ b/build/rust/tests/bindgen_static_fns_test/lib.h
@@ -19,11 +19,7 @@
#endif // defined(COMPONENT_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(COMPONENT_IMPLEMENTATION)
#define COMPONENT_EXPORT __attribute__((visibility("default")))
-#else
-#define COMPONENT_EXPORT
-#endif // defined(COMPONENT_IMPLEMENTATION)
#endif
#else // defined(COMPONENT_BUILD)
@@ -46,4 +42,4 @@ COMPONENT_EXPORT uint32_t mul_two_numbers(uint32_t a, uint32_t b);
}
#endif
-#endif // BUILD_RUST_TESTS_BINDGEN_STATIC_FNS_TEST_LIB_H_
+#endif // BUILD_RUST_TESTS_BINDGEN_STATIC_FNS_TEST_LIB_H_
diff --git a/build/rust/tests/bindgen_test/lib.h b/build/rust/tests/bindgen_test/lib.h
index a6d686e82707a..835f65931b639 100644
--- a/build/rust/tests/bindgen_test/lib.h
+++ b/build/rust/tests/bindgen_test/lib.h
@@ -21,11 +21,7 @@
#endif // defined(COMPONENT_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(COMPONENT_IMPLEMENTATION)
#define COMPONENT_EXPORT __attribute__((visibility("default")))
-#else
-#define COMPONENT_EXPORT
-#endif // defined(COMPONENT_IMPLEMENTATION)
#endif
#else // defined(COMPONENT_BUILD)
@@ -42,4 +38,4 @@ COMPONENT_EXPORT uint32_t add_two_numbers(uint32_t a, uint32_t b);
}
#endif
-#endif // BUILD_RUST_TESTS_BINDGEN_TEST_LIB_H_
+#endif // BUILD_RUST_TESTS_BINDGEN_TEST_LIB_H_
diff --git a/cc/animation/animation_export.h b/cc/animation/animation_export.h
index 4ae155413ad27..d2495182ec555 100644
--- a/cc/animation/animation_export.h
+++ b/cc/animation/animation_export.h
@@ -15,11 +15,7 @@
#endif // defined(CC_ANIMATION_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(CC_ANIMATION_IMPLEMENTATION)
#define CC_ANIMATION_EXPORT __attribute__((visibility("default")))
-#else
-#define CC_ANIMATION_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/cc/base/base_export.h b/cc/base/base_export.h
index cd4a3e912d8ba..87e41f03640e2 100644
--- a/cc/base/base_export.h
+++ b/cc/base/base_export.h
@@ -15,11 +15,7 @@
#endif // defined(CC_BASE_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(CC_BASE_IMPLEMENTATION)
#define CC_BASE_EXPORT __attribute__((visibility("default")))
-#else
-#define CC_BASE_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/cc/cc_export.h b/cc/cc_export.h
index 9600c191840e2..0c321a924f253 100644
--- a/cc/cc_export.h
+++ b/cc/cc_export.h
@@ -15,11 +15,7 @@
#endif // defined(CC_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(CC_IMPLEMENTATION)
#define CC_EXPORT __attribute__((visibility("default")))
-#else
-#define CC_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/cc/debug/debug_export.h b/cc/debug/debug_export.h
index 04792aae640d8..7c3bea1a48535 100644
--- a/cc/debug/debug_export.h
+++ b/cc/debug/debug_export.h
@@ -15,11 +15,7 @@
#endif // defined(CC_DEBUG_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(CC_DEBUG_IMPLEMENTATION)
#define CC_DEBUG_EXPORT __attribute__((visibility("default")))
-#else
-#define CC_DEBUG_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/cc/mojo_embedder/mojo_embedder_export.h b/cc/mojo_embedder/mojo_embedder_export.h
index c6eca8a1f3786..825d24398e86d 100644
--- a/cc/mojo_embedder/mojo_embedder_export.h
+++ b/cc/mojo_embedder/mojo_embedder_export.h
@@ -15,11 +15,7 @@
#endif // defined(CC_MOJO_EMBEDDER_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(CC_MOJO_EMBEDDER_IMPLEMENTATION)
#define CC_MOJO_EMBEDDER_EXPORT __attribute__((visibility("default")))
-#else
-#define CC_MOJO_EMBEDDER_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/cc/paint/paint_export.h b/cc/paint/paint_export.h
index 0b14d855abb2a..7a935c9624a0a 100644
--- a/cc/paint/paint_export.h
+++ b/cc/paint/paint_export.h
@@ -15,11 +15,7 @@
#endif // defined(CC_PAINT_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(CC_PAINT_IMPLEMENTATION)
#define CC_PAINT_EXPORT __attribute__((visibility("default")))
-#else
-#define CC_PAINT_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/chrome/browser/ui/views/chrome_views_export.h b/chrome/browser/ui/views/chrome_views_export.h
index c6b92e8f8c3bb..e5bd1c14fb9af 100644
--- a/chrome/browser/ui/views/chrome_views_export.h
+++ b/chrome/browser/ui/views/chrome_views_export.h
@@ -19,11 +19,7 @@
#else // !defined(WIN32)
-#if defined(CHROME_VIEWS_IMPLEMENTATION)
#define CHROME_VIEWS_EXPORT __attribute__((visibility("default")))
-#else
-#define CHROME_VIEWS_EXPORT
-#endif
#endif // defined(WIN32)
diff --git a/chrome/browser/vr/vr_base_export.h b/chrome/browser/vr/vr_base_export.h
index cf5ae11b599a7..ed5a94b21bdf9 100644
--- a/chrome/browser/vr/vr_base_export.h
+++ b/chrome/browser/vr/vr_base_export.h
@@ -15,11 +15,7 @@
#endif // defined(VR_BASE_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(VR_BASE_IMPLEMENTATION)
#define VR_BASE_EXPORT __attribute__((visibility("default")))
-#else
-#define VR_BASE_EXPORT
-#endif // defined(VR_BASE_IMPLEMENTATION)
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/chrome/browser/vr/vr_export.h b/chrome/browser/vr/vr_export.h
index 32cb17b6822b9..1f046359e8f3a 100644
--- a/chrome/browser/vr/vr_export.h
+++ b/chrome/browser/vr/vr_export.h
@@ -15,11 +15,7 @@
#endif // defined(VR_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(VR_IMPLEMENTATION)
#define VR_EXPORT __attribute__((visibility("default")))
-#else
-#define VR_EXPORT
-#endif // defined(VR_IMPLEMENTATION)
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/chrome/browser/vr/vr_ui_export.h b/chrome/browser/vr/vr_ui_export.h
index 23e591a9dad8d..9a35ec649c4f0 100644
--- a/chrome/browser/vr/vr_ui_export.h
+++ b/chrome/browser/vr/vr_ui_export.h
@@ -15,11 +15,7 @@
#endif // defined(VR_UI_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(VR_UI_IMPLEMENTATION)
#define VR_UI_EXPORT __attribute__((visibility("default")))
-#else
-#define VR_UI_EXPORT
-#endif // defined(VR_UI_IMPLEMENTATION)
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/chromeos/ash/experiences/arc/arc_export.h b/chromeos/ash/experiences/arc/arc_export.h
index 12a58a9a99b1c..4dd237d6f211c 100644
--- a/chromeos/ash/experiences/arc/arc_export.h
+++ b/chromeos/ash/experiences/arc/arc_export.h
@@ -9,10 +9,6 @@
static_assert(BUILDFLAG(IS_CHROMEOS), "ARC can be built only for ChromeOS.");
-#if defined(COMPONENT_BUILD) && defined(ARC_IMPLEMENTATION)
#define ARC_EXPORT __attribute__((visibility("default")))
-#else // !defined(COMPONENT_BUILD) || !defined(ARC_IMPLEMENTATION)
-#define ARC_EXPORT
-#endif
#endif // CHROMEOS_ASH_EXPERIENCES_ARC_ARC_EXPORT_H_
diff --git a/chromeos/chromeos_export.h b/chromeos/chromeos_export.h
index 1d61005a9444b..41d2f2a22541a 100644
--- a/chromeos/chromeos_export.h
+++ b/chromeos/chromeos_export.h
@@ -15,11 +15,7 @@
#endif // defined(CHROMEOS_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(CHROMEOS_IMPLEMENTATION) || defined(IS_CHROMEOS_SYSTEM_IMPL)
#define CHROMEOS_EXPORT __attribute__((visibility("default")))
-#else
-#define CHROMEOS_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/components/captive_portal/core/captive_portal_export.h b/components/captive_portal/core/captive_portal_export.h
index 87c8484511d40..0c5613e403942 100644
--- a/components/captive_portal/core/captive_portal_export.h
+++ b/components/captive_portal/core/captive_portal_export.h
@@ -15,11 +15,7 @@
#endif // defined(CAPTIVE_PORTAL_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(CAPTIVE_PORTAL_IMPLEMENTATION)
#define CAPTIVE_PORTAL_EXPORT __attribute__((visibility("default")))
-#else
-#define CAPTIVE_PORTAL_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/components/capture_mode/capture_mode_export.h b/components/capture_mode/capture_mode_export.h
index 7b6896928b501..e13f9184b860d 100644
--- a/components/capture_mode/capture_mode_export.h
+++ b/components/capture_mode/capture_mode_export.h
@@ -15,11 +15,7 @@
#endif // defined(CAPTURE_MODE_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(CAPTURE_MODE_IMPLEMENTATION)
#define CAPTURE_MODE_EXPORT __attribute__((visibility("default")))
-#else
-#define CAPTURE_MODE_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/components/cast/cast_component_export.h b/components/cast/cast_component_export.h
index 5c65030313289..decebae814413 100644
--- a/components/cast/cast_component_export.h
+++ b/components/cast/cast_component_export.h
@@ -5,10 +5,9 @@
#ifndef COMPONENTS_CAST_CAST_COMPONENT_EXPORT_H_
#define COMPONENTS_CAST_CAST_COMPONENT_EXPORT_H_
-#if defined(COMPONENT_BUILD) && defined(CAST_COMPONENT_IMPLEMENTATION)
+#if defined(COMPONENT_BUILD)
#define CAST_COMPONENT_EXPORT __attribute__((visibility("default")))
-#else // !defined(COMPONENT_BUILD) ||
- // !defined(CAST_COMPONENT_EXPORT)
+#else // !defined(COMPONENT_BUILD)
#define CAST_COMPONENT_EXPORT
#endif
diff --git a/components/cbor/cbor_export.h b/components/cbor/cbor_export.h
index a04d88c334c0c..410d555d41c50 100644
--- a/components/cbor/cbor_export.h
+++ b/components/cbor/cbor_export.h
@@ -15,11 +15,7 @@
#endif // defined(CBOR_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(CBOR_IMPLEMENTATION)
#define CBOR_EXPORT __attribute__((visibility("default")))
-#else
-#define CBOR_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/components/crash/core/common/crash_export.h b/components/crash/core/common/crash_export.h
index 7496a5af18bb5..f13dc9c62d4ea 100644
--- a/components/crash/core/common/crash_export.h
+++ b/components/crash/core/common/crash_export.h
@@ -15,11 +15,7 @@
#endif // defined(CRASH_CORE_COMMON_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(CRASH_CORE_COMMON_IMPLEMENTATION)
#define CRASH_EXPORT __attribute__((visibility("default")))
-#else
-#define CRASH_EXPORT
-#endif // defined(CRASH_CORE_COMMON_IMPLEMENTATION)
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/components/device_event_log/device_event_log_export.h b/components/device_event_log/device_event_log_export.h
index 4c4cb525accc4..6ca238ada109f 100644
--- a/components/device_event_log/device_event_log_export.h
+++ b/components/device_event_log/device_event_log_export.h
@@ -16,19 +16,11 @@
#endif // defined(DEVICE_EVENT_LOG_IMPLEMENTATION)
#else // defined(WIN32)
-
-#if defined(DEVICE_EVENT_LOG_IMPLEMENTATION)
#define DEVICE_EVENT_LOG_EXPORT __attribute__((visibility("default")))
-#else
-#define DEVICE_EVENT_LOG_EXPORT
-#endif // defined(DEVICE_EVENT_LOG_IMPLEMENTATION)
-
#endif // defined(WIN32)
#else // defined(COMPONENT_BUILD)
-
#define DEVICE_EVENT_LOG_EXPORT
-
#endif
#endif // COMPONENTS_DEVICE_EVENT_LOG_DEVICE_EVENT_LOG_EXPORT_H_
diff --git a/components/discardable_memory/common/discardable_memory_export.h b/components/discardable_memory/common/discardable_memory_export.h
index 857815cdb8bc2..630407064d27f 100644
--- a/components/discardable_memory/common/discardable_memory_export.h
+++ b/components/discardable_memory/common/discardable_memory_export.h
@@ -15,11 +15,7 @@
#endif // defined(DISCARDABLE_MEMORY_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(DISCARDABLE_MEMORY_IMPLEMENTATION)
#define DISCARDABLE_MEMORY_EXPORT __attribute__((visibility("default")))
-#else
-#define DISCARDABLE_MEMORY_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/components/domain_reliability/domain_reliability_export.h b/components/domain_reliability/domain_reliability_export.h
index 169d9b6673aef..87b98d6d8c8ce 100644
--- a/components/domain_reliability/domain_reliability_export.h
+++ b/components/domain_reliability/domain_reliability_export.h
@@ -16,11 +16,7 @@
#else // defined(WIN32)
-#if defined(DOMAIN_RELIABILITY_IMPLEMENTATION)
#define DOMAIN_RELIABILITY_EXPORT __attribute__((visibility("default")))
-#else
-#define DOMAIN_RELIABILITY_EXPORT
-#endif
#endif // defined(WIN32)
#else // defined(COMPONENT_BUILD)
diff --git a/components/download/public/common/download_export.h b/components/download/public/common/download_export.h
index abc049fc770a8..4be8087d2509c 100644
--- a/components/download/public/common/download_export.h
+++ b/components/download/public/common/download_export.h
@@ -15,11 +15,7 @@
#endif // defined(COMPONENTS_DOWNLOAD_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(COMPONENTS_DOWNLOAD_IMPLEMENTATION)
#define COMPONENTS_DOWNLOAD_EXPORT __attribute__((visibility("default")))
-#else
-#define COMPONENTS_DOWNLOAD_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/components/drive/drive_export.h b/components/drive/drive_export.h
index 5c8d3c0c78053..5d1fa02a1c1c9 100644
--- a/components/drive/drive_export.h
+++ b/components/drive/drive_export.h
@@ -17,13 +17,8 @@
#endif // defined(COMPONENTS_DRIVE_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(COMPONENTS_DRIVE_IMPLEMENTATION)
#define COMPONENTS_DRIVE_EXPORT __attribute__((visibility("default")))
#define COMPONENTS_DRIVE_EXPORT_PRIVATE __attribute__((visibility("default")))
-#else
-#define COMPONENTS_DRIVE_EXPORT
-#define COMPONENTS_DRIVE_EXPORT_PRIVATE
-#endif
#endif
#else /// defined(COMPONENT_BUILD)
diff --git a/components/gcm_driver/common/gcm_driver_export.h b/components/gcm_driver/common/gcm_driver_export.h
index aa47838afec78..9c767a3bdf5f0 100644
--- a/components/gcm_driver/common/gcm_driver_export.h
+++ b/components/gcm_driver/common/gcm_driver_export.h
@@ -15,11 +15,7 @@
#endif // defined(GCM_DRIVER_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(GCM_DRIVER_IMPLEMENTATION)
#define GCM_DRIVER_EXPORT __attribute__((visibility("default")))
-#else
-#define GCM_DRIVER_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/components/gwp_asan/client/export.h b/components/gwp_asan/client/export.h
index 99043e7ad7a1a..052dba52ed8bb 100644
--- a/components/gwp_asan/client/export.h
+++ b/components/gwp_asan/client/export.h
@@ -15,11 +15,7 @@
#endif // defined(GWP_ASAN_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(GWP_ASAN_IMPLEMENTATION)
#define GWP_ASAN_EXPORT __attribute__((visibility("default")))
-#else
-#define GWP_ASAN_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/components/keyed_service/core/keyed_service_export.h b/components/keyed_service/core/keyed_service_export.h
index 86482be31278b..5edd1c7644840 100644
--- a/components/keyed_service/core/keyed_service_export.h
+++ b/components/keyed_service/core/keyed_service_export.h
@@ -15,11 +15,7 @@
#endif // defined(KEYED_SERVICE_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(KEYED_SERVICE_IMPLEMENTATION)
#define KEYED_SERVICE_EXPORT __attribute__((visibility("default")))
-#else
-#define KEYED_SERVICE_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/components/login/login_export.h b/components/login/login_export.h
index 35af257c6b63c..2203d3c4d0dc7 100644
--- a/components/login/login_export.h
+++ b/components/login/login_export.h
@@ -16,19 +16,11 @@
#endif // defined(LOGIN_IMPLEMENTATION)
#else // defined(WIN32)
-
-#if defined(LOGIN_IMPLEMENTATION)
#define LOGIN_EXPORT __attribute__((visibility("default")))
-#else
-#define LOGIN_EXPORT
-#endif // defined(LOGIN_IMPLEMENTATION)
-
#endif // defined(WIN32)
#else // defined(COMPONENT_BUILD)
-
#define LOGIN_EXPORT
-
#endif
#endif // COMPONENTS_LOGIN_LOGIN_EXPORT_H_
diff --git a/components/metal_util/metal_util_export.h b/components/metal_util/metal_util_export.h
index 2973ef0b35464..e027220bc7c51 100644
--- a/components/metal_util/metal_util_export.h
+++ b/components/metal_util/metal_util_export.h
@@ -15,11 +15,7 @@
#endif // defined(METAL_UTIL_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(METAL_UTIL_IMPLEMENTATION)
#define METAL_UTIL_EXPORT __attribute__((visibility("default")))
-#else
-#define METAL_UTIL_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/components/ownership/ownership_export.h b/components/ownership/ownership_export.h
index 69321004157a0..c259a1ce19ae2 100644
--- a/components/ownership/ownership_export.h
+++ b/components/ownership/ownership_export.h
@@ -17,11 +17,7 @@
#else // defined(WIN32)
-#if defined(OWNERSHIP_IMPLEMENTATION)
#define OWNERSHIP_EXPORT __attribute__((visibility("default")))
-#else
-#define OWNERSHIP_EXPORT
-#endif // defined(OWNERSHIP_IMPLEMENTATION)
#endif // defined(WIN32)
diff --git a/components/policy/policy_export.h b/components/policy/policy_export.h
index a92647ffad3c7..1e52705c4737e 100644
--- a/components/policy/policy_export.h
+++ b/components/policy/policy_export.h
@@ -16,19 +16,11 @@
#endif // defined(POLICY_COMPONENT_IMPLEMENTATION)
#else // defined(WIN32)
-
-#if defined(POLICY_COMPONENT_IMPLEMENTATION)
#define POLICY_EXPORT __attribute__((visibility("default")))
-#else
-#define POLICY_EXPORT
-#endif // defined(POLICY_COMPONENT_IMPLEMENTATION)
-
#endif // defined(WIN32)
#else // defined(COMPONENT_BUILD)
-
#define POLICY_EXPORT
-
#endif // defined(COMPONENT_BUILD)
#endif // COMPONENTS_POLICY_POLICY_EXPORT_H_
diff --git a/components/policy/proto/policy_proto_export.h b/components/policy/proto/policy_proto_export.h
index 829356a973c30..16dc5fe5931c5 100644
--- a/components/policy/proto/policy_proto_export.h
+++ b/components/policy/proto/policy_proto_export.h
@@ -22,27 +22,14 @@
#endif // defined(POLICY_PROTO_COMPILATION)
#else // defined(WIN32)
-
-#if defined(POLICY_PROTO_COMPILATION)
#define POLICY_PROTO_EXPORT __attribute__((visibility("default")))
-#else
-#define POLICY_PROTO_EXPORT
-#endif // defined(POLICY_PROTO_COMPILATION)
-
-#if defined(POLICY_CHROME_SETTINGS_PROTO_COMPILATION)
#define POLICY_CHROME_SETTINGS_PROTO_EXPORT \
__attribute__((visibility("default")))
-#else
-#define POLICY_CHROME_SETTINGS_PROTO_EXPORT
-#endif // defined(POLICY_PROTO_COMPILATION)
-
#endif // defined(WIN32)
#else // defined(COMPONENT_BUILD)
-
#define POLICY_PROTO_EXPORT
#define POLICY_CHROME_SETTINGS_PROTO_EXPORT
-
#endif // defined(COMPONENT_BUILD)
#endif // COMPONENTS_POLICY_PROTO_POLICY_PROTO_EXPORT_H_
diff --git a/components/prefs/prefs_export.h b/components/prefs/prefs_export.h
index 8e5ee4f0246e7..2086ffc409585 100644
--- a/components/prefs/prefs_export.h
+++ b/components/prefs/prefs_export.h
@@ -15,11 +15,7 @@
#endif // defined(COMPONENTS_PREFS_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(COMPONENTS_PREFS_IMPLEMENTATION)
#define COMPONENTS_PREFS_EXPORT __attribute__((visibility("default")))
-#else
-#define COMPONENTS_PREFS_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/components/proxy_config/proxy_config_export.h b/components/proxy_config/proxy_config_export.h
index 375f6d087ed7c..0f82367e9837e 100644
--- a/components/proxy_config/proxy_config_export.h
+++ b/components/proxy_config/proxy_config_export.h
@@ -15,11 +15,7 @@
#endif // defined(PROXY_CONFIG_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(PROXY_CONFIG_IMPLEMENTATION)
#define PROXY_CONFIG_EXPORT __attribute__((visibility("default")))
-#else
-#define PROXY_CONFIG_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/components/quirks/quirks_export.h b/components/quirks/quirks_export.h
index ff1a2e1a5826a..ba72414252337 100644
--- a/components/quirks/quirks_export.h
+++ b/components/quirks/quirks_export.h
@@ -15,11 +15,7 @@
#endif // defined(QUIRKS_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(QUIRKS_IMPLEMENTATION)
#define QUIRKS_EXPORT __attribute__((visibility("default")))
-#else
-#define QUIRKS_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/components/remote_cocoa/app_shim/remote_cocoa_app_shim_export.h b/components/remote_cocoa/app_shim/remote_cocoa_app_shim_export.h
index bf4039af34ba0..6bbaa9b79ad31 100644
--- a/components/remote_cocoa/app_shim/remote_cocoa_app_shim_export.h
+++ b/components/remote_cocoa/app_shim/remote_cocoa_app_shim_export.h
@@ -9,11 +9,7 @@
// RemoteCocoa app shim module can be exported to consumers.
#if defined(COMPONENT_BUILD)
-#if defined(REMOTE_COCOA_APP_SHIM_IMPLEMENTATION)
#define REMOTE_COCOA_APP_SHIM_EXPORT __attribute__((visibility("default")))
-#else
-#define REMOTE_COCOA_APP_SHIM_EXPORT
-#endif
#else // defined(COMPONENT_BUILD)
#define REMOTE_COCOA_APP_SHIM_EXPORT
diff --git a/components/remote_cocoa/browser/remote_cocoa_browser_export.h b/components/remote_cocoa/browser/remote_cocoa_browser_export.h
index 95efd0c705af5..3759f737601f3 100644
--- a/components/remote_cocoa/browser/remote_cocoa_browser_export.h
+++ b/components/remote_cocoa/browser/remote_cocoa_browser_export.h
@@ -9,11 +9,7 @@
// RemoteCocoa browser module can be exported to consumers.
#if defined(COMPONENT_BUILD)
-#if defined(REMOTE_COCOA_BROWSER_IMPLEMENTATION)
#define REMOTE_COCOA_BROWSER_EXPORT __attribute__((visibility("default")))
-#else
-#define REMOTE_COCOA_BROWSER_EXPORT
-#endif
#else // defined(COMPONENT_BUILD)
#define REMOTE_COCOA_BROWSER_EXPORT
diff --git a/components/session_manager/session_manager_export.h b/components/session_manager/session_manager_export.h
index ba11e2ae9f2ec..406679ade35d6 100644
--- a/components/session_manager/session_manager_export.h
+++ b/components/session_manager/session_manager_export.h
@@ -15,11 +15,7 @@
#endif // defined(SESSION_EXPORT)
#else // defined(WIN32)
-#if defined(SESSION_IMPLEMENTATION)
#define SESSION_EXPORT __attribute__((visibility("default")))
-#else
-#define SESSION_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/components/sessions/core/sessions_export.h b/components/sessions/core/sessions_export.h
index 097301c034fba..4978bb5aa04b4 100644
--- a/components/sessions/core/sessions_export.h
+++ b/components/sessions/core/sessions_export.h
@@ -15,11 +15,7 @@
#endif // defined(SESSIONS_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(SESSIONS_IMPLEMENTATION)
#define SESSIONS_EXPORT __attribute__((visibility("default")))
-#else
-#define SESSIONS_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/components/tracing/tracing_export.h b/components/tracing/tracing_export.h
index 357d8c0999615..517571118e051 100644
--- a/components/tracing/tracing_export.h
+++ b/components/tracing/tracing_export.h
@@ -15,11 +15,7 @@
#endif // defined(TRACING_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(TRACING_IMPLEMENTATION)
#define TRACING_EXPORT __attribute__((visibility("default")))
-#else
-#define TRACING_EXPORT
-#endif // defined(TRACING_IMPLEMENTATION)
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/components/ui_devtools/devtools_export.h b/components/ui_devtools/devtools_export.h
index 46dfc8059700b..ab393500f6310 100644
--- a/components/ui_devtools/devtools_export.h
+++ b/components/ui_devtools/devtools_export.h
@@ -15,11 +15,7 @@
#endif // defined(UI_DEVTOOLS_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(UI_DEVTOOLS_IMPLEMENTATION)
#define UI_DEVTOOLS_EXPORT __attribute__((visibility("default")))
-#else
-#define UI_DEVTOOLS_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/components/url_matcher/url_matcher_export.h b/components/url_matcher/url_matcher_export.h
index 44504582487fa..54ff967f501c6 100644
--- a/components/url_matcher/url_matcher_export.h
+++ b/components/url_matcher/url_matcher_export.h
@@ -15,11 +15,7 @@
#endif // defined(URL_MATCHER_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(URL_MATCHER_IMPLEMENTATION)
#define URL_MATCHER_EXPORT __attribute__((visibility("default")))
-#else
-#define URL_MATCHER_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/components/user_manager/user_manager_export.h b/components/user_manager/user_manager_export.h
index f336d37f0a7b2..51f149a1942ff 100644
--- a/components/user_manager/user_manager_export.h
+++ b/components/user_manager/user_manager_export.h
@@ -15,11 +15,7 @@
#endif // defined(USER_MANAGER_EXPORT)
#else // defined(WIN32)
-#if defined(USER_MANAGER_IMPLEMENTATION)
#define USER_MANAGER_EXPORT __attribute__((visibility("default")))
-#else
-#define USER_MANAGER_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/components/user_prefs/user_prefs_export.h b/components/user_prefs/user_prefs_export.h
index 736594374f256..a0be0f6b1f774 100644
--- a/components/user_prefs/user_prefs_export.h
+++ b/components/user_prefs/user_prefs_export.h
@@ -15,11 +15,7 @@
#endif // defined(USER_PREFS_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(USER_PREFS_IMPLEMENTATION)
#define USER_PREFS_EXPORT __attribute__((visibility("default")))
-#else
-#define USER_PREFS_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/components/viz/client/viz_client_export.h b/components/viz/client/viz_client_export.h
index 6aed35deed9eb..006adf58ab24c 100644
--- a/components/viz/client/viz_client_export.h
+++ b/components/viz/client/viz_client_export.h
@@ -15,11 +15,7 @@
#endif // defined(VIZ_CLIENT_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(VIZ_CLIENT_IMPLEMENTATION)
#define VIZ_CLIENT_EXPORT __attribute__((visibility("default")))
-#else
-#define VIZ_CLIENT_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/components/viz/common/viz_common_export.h b/components/viz/common/viz_common_export.h
index a383cedfbaa27..f435520944ff4 100644
--- a/components/viz/common/viz_common_export.h
+++ b/components/viz/common/viz_common_export.h
@@ -15,11 +15,7 @@
#endif // defined(VIZ_COMMON_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(VIZ_COMMON_IMPLEMENTATION)
#define VIZ_COMMON_EXPORT __attribute__((visibility("default")))
-#else
-#define VIZ_COMMON_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/components/viz/common/viz_metal_context_provider_export.h b/components/viz/common/viz_metal_context_provider_export.h
index edf4d63cb906c..d405ecc24cd8c 100644
--- a/components/viz/common/viz_metal_context_provider_export.h
+++ b/components/viz/common/viz_metal_context_provider_export.h
@@ -15,11 +15,7 @@
#endif // defined(VIZ_METAL_CONTEXT_PROVIDER_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(VIZ_METAL_CONTEXT_PROVIDER_IMPLEMENTATION)
#define VIZ_METAL_CONTEXT_PROVIDER_EXPORT __attribute__((visibility("default")))
-#else
-#define VIZ_METAL_CONTEXT_PROVIDER_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/components/viz/host/viz_host_export.h b/components/viz/host/viz_host_export.h
index 2cc7dc7dc324d..9913f10948ec7 100644
--- a/components/viz/host/viz_host_export.h
+++ b/components/viz/host/viz_host_export.h
@@ -15,11 +15,7 @@
#endif // defined(VIZ_HOST_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(VIZ_HOST_IMPLEMENTATION)
#define VIZ_HOST_EXPORT __attribute__((visibility("default")))
-#else
-#define VIZ_HOST_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/components/viz/service/viz_service_export.h b/components/viz/service/viz_service_export.h
index e89b1fd295391..2a56680f79701 100644
--- a/components/viz/service/viz_service_export.h
+++ b/components/viz/service/viz_service_export.h
@@ -15,11 +15,7 @@
#endif // defined(VIZ_SERVICE_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(VIZ_SERVICE_IMPLEMENTATION)
#define VIZ_SERVICE_EXPORT __attribute__((visibility("default")))
-#else
-#define VIZ_SERVICE_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/components/web_modal/web_modal_export.h b/components/web_modal/web_modal_export.h
index 158e79eb8ad85..0a4f33063b433 100644
--- a/components/web_modal/web_modal_export.h
+++ b/components/web_modal/web_modal_export.h
@@ -15,11 +15,7 @@
#endif // defined(WEB_MODAL_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(WEB_MODAL_IMPLEMENTATION)
#define WEB_MODAL_EXPORT __attribute__((visibility("default")))
-#else
-#define WEB_MODAL_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/components/webdata/common/webdata_export.h b/components/webdata/common/webdata_export.h
index fbeffc03097ee..1a4b2eedec31d 100644
--- a/components/webdata/common/webdata_export.h
+++ b/components/webdata/common/webdata_export.h
@@ -15,11 +15,7 @@
#endif // defined(WEBDATA_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(WEBDATA_IMPLEMENTATION)
#define WEBDATA_EXPORT __attribute__((visibility("default")))
-#else
-#define WEBDATA_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/components/wifi/wifi_export.h b/components/wifi/wifi_export.h
index 0070df12c8f65..9dc2ce354a293 100644
--- a/components/wifi/wifi_export.h
+++ b/components/wifi/wifi_export.h
@@ -15,11 +15,7 @@
#endif // defined(WIFI_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(WIFI_IMPLEMENTATION)
#define WIFI_EXPORT __attribute__((visibility("default")))
-#else
-#define WIFI_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/content/common/content_export.h b/content/common/content_export.h
index 92ad6c7573d73..c4245cfea1448 100644
--- a/content/common/content_export.h
+++ b/content/common/content_export.h
@@ -15,11 +15,7 @@
#endif // defined(CONTENT_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(CONTENT_IMPLEMENTATION)
#define CONTENT_EXPORT __attribute__((visibility("default")))
-#else
-#define CONTENT_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/crypto/crypto_export.h b/crypto/crypto_export.h
index 66bd53cbcccb7..186d294bed43d 100644
--- a/crypto/crypto_export.h
+++ b/crypto/crypto_export.h
@@ -18,11 +18,7 @@
#endif // defined(CRYPTO_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(CRYPTO_IMPLEMENTATION)
#define CRYPTO_EXPORT __attribute__((visibility("default")))
-#else
-#define CRYPTO_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/dbus/dbus_export.h b/dbus/dbus_export.h
index 1874aa9c5d5f3..029b7ecd29b5e 100644
--- a/dbus/dbus_export.h
+++ b/dbus/dbus_export.h
@@ -15,17 +15,9 @@
#endif // defined(WIN32)
#if defined(COMPONENT_BUILD)
-
-#if defined(DBUS_IMPLEMENTATION)
#define CHROME_DBUS_EXPORT __attribute__((visibility("default")))
-#else
-#define CHROME_DBUS_EXPORT
-#endif
-
#else // !defined(COMPONENT_BUILD)
-
#define CHROME_DBUS_EXPORT
-
#endif // defined(COMPONENT_BUILD)
#endif // DBUS_DBUS_EXPORT_H_
diff --git a/device/base/device_base_export.h b/device/base/device_base_export.h
index 8672b65e8b290..f7d7453925d35 100644
--- a/device/base/device_base_export.h
+++ b/device/base/device_base_export.h
@@ -15,11 +15,7 @@
#elif defined(COMPONENT_BUILD) && !defined(WIN32)
-#if defined(DEVICE_BASE_IMPLEMENTATION)
#define DEVICE_BASE_EXPORT __attribute__((visibility("default")))
-#else
-#define DEVICE_BASE_EXPORT
-#endif
#else
#define DEVICE_BASE_EXPORT
diff --git a/device/bluetooth/bluetooth_export.h b/device/bluetooth/bluetooth_export.h
index 7b82a39e07969..69af504b9369a 100644
--- a/device/bluetooth/bluetooth_export.h
+++ b/device/bluetooth/bluetooth_export.h
@@ -15,11 +15,7 @@
#elif defined(COMPONENT_BUILD) && !defined(WIN32)
-#if defined(DEVICE_BLUETOOTH_IMPLEMENTATION)
#define DEVICE_BLUETOOTH_EXPORT __attribute__((visibility("default")))
-#else
-#define DEVICE_BLUETOOTH_EXPORT
-#endif
#else
#define DEVICE_BLUETOOTH_EXPORT
diff --git a/device/gamepad/gamepad_export.h b/device/gamepad/gamepad_export.h
index 3479e781956d2..1d6cf2dc142dd 100644
--- a/device/gamepad/gamepad_export.h
+++ b/device/gamepad/gamepad_export.h
@@ -15,11 +15,7 @@
#elif defined(COMPONENT_BUILD) && !defined(WIN32)
-#if defined(DEVICE_GAMEPAD_IMPLEMENTATION)
#define DEVICE_GAMEPAD_EXPORT __attribute__((visibility("default")))
-#else
-#define DEVICE_GAMEPAD_EXPORT
-#endif
#else
#define DEVICE_GAMEPAD_EXPORT
diff --git a/device/gamepad/public/cpp/gamepad_features_export.h b/device/gamepad/public/cpp/gamepad_features_export.h
index 0b3a46e18c306..a76995236d1a8 100644
--- a/device/gamepad/public/cpp/gamepad_features_export.h
+++ b/device/gamepad/public/cpp/gamepad_features_export.h
@@ -17,11 +17,7 @@
#else // !defined(WIN32)
-#if defined(GAMEPAD_FEATURES_IMPLEMENTATION)
#define GAMEPAD_FEATURES_EXPORT __attribute__((visibility("default")))
-#else
-#define GAMEPAD_FEATURES_EXPORT
-#endif
#endif
diff --git a/device/vr/vr_export.h b/device/vr/vr_export.h
index 43390e1293dc0..adc9426233bd2 100644
--- a/device/vr/vr_export.h
+++ b/device/vr/vr_export.h
@@ -15,11 +15,7 @@
#elif defined(COMPONENT_BUILD) && !defined(WIN32)
-#if defined(DEVICE_VR_IMPLEMENTATION)
#define DEVICE_VR_EXPORT __attribute__((visibility("default")))
-#else
-#define DEVICE_VR_EXPORT
-#endif
#else
#define DEVICE_VR_EXPORT
diff --git a/extensions/common/extensions_export.h b/extensions/common/extensions_export.h
index 5f05f3583aee3..1f2cb671eecbc 100644
--- a/extensions/common/extensions_export.h
+++ b/extensions/common/extensions_export.h
@@ -16,11 +16,7 @@
#endif // defined(EXTENSIONS_COMPONENT_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(EXTENSIONS_COMPONENT_IMPLEMENTATION)
#define EXTENSIONS_EXPORT __attribute__((visibility("default")))
-#else
-#define EXTENSIONS_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/fuchsia_web/webengine/web_engine_export.h b/fuchsia_web/webengine/web_engine_export.h
index f96cb77bf7299..e219ead8c0cbf 100644
--- a/fuchsia_web/webengine/web_engine_export.h
+++ b/fuchsia_web/webengine/web_engine_export.h
@@ -7,11 +7,7 @@
#if defined(COMPONENT_BUILD)
-#if defined(WEB_ENGINE_IMPLEMENTATION)
#define WEB_ENGINE_EXPORT __attribute__((visibility("default")))
-#else
-#define WEB_ENGINE_EXPORT
-#endif
#else // defined(COMPONENT_BUILD)
#define WEB_ENGINE_EXPORT
diff --git a/gin/gin_export.h b/gin/gin_export.h
index 83986e6ec9e4b..9aa36fe1807ba 100644
--- a/gin/gin_export.h
+++ b/gin/gin_export.h
@@ -15,11 +15,7 @@
#endif // defined(GIN_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(GIN_IMPLEMENTATION)
#define GIN_EXPORT __attribute__((visibility("default")))
-#else
-#define GIN_EXPORT
-#endif // defined(GIN_IMPLEMENTATION)
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/google_apis/gcm/base/gcm_export.h b/google_apis/gcm/base/gcm_export.h
index 7e29ee7603908..82e0f3335d572 100644
--- a/google_apis/gcm/base/gcm_export.h
+++ b/google_apis/gcm/base/gcm_export.h
@@ -15,11 +15,7 @@
#endif // defined(GCM_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(GCM_IMPLEMENTATION)
#define GCM_EXPORT __attribute__((visibility("default")))
-#else
-#define GCM_EXPORT
-#endif // defined(GCM_IMPLEMENTATION)
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/gpu/command_buffer/client/gles2_c_lib_export.h b/gpu/command_buffer/client/gles2_c_lib_export.h
index b9d3fb14dd399..3d6449aaeaf1b 100644
--- a/gpu/command_buffer/client/gles2_c_lib_export.h
+++ b/gpu/command_buffer/client/gles2_c_lib_export.h
@@ -15,11 +15,7 @@
#endif // defined(GLES2_C_LIB_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(GLES2_C_LIB_IMPLEMENTATION)
#define GLES2_C_LIB_EXPORT __attribute__((visibility("default")))
-#else
-#define GLES2_C_LIB_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/gpu/command_buffer/client/gles2_impl_export.h b/gpu/command_buffer/client/gles2_impl_export.h
index 1a5168cd6c9a9..0f6ee0d3d3895 100644
--- a/gpu/command_buffer/client/gles2_impl_export.h
+++ b/gpu/command_buffer/client/gles2_impl_export.h
@@ -15,11 +15,7 @@
#endif // defined(GLES2_IMPL_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(GLES2_IMPL_IMPLEMENTATION)
#define GLES2_IMPL_EXPORT __attribute__((visibility("default")))
-#else
-#define GLES2_IMPL_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/gpu/command_buffer/client/webgpu_export.h b/gpu/command_buffer/client/webgpu_export.h
index b36273085ddb1..9483a94531067 100644
--- a/gpu/command_buffer/client/webgpu_export.h
+++ b/gpu/command_buffer/client/webgpu_export.h
@@ -15,11 +15,7 @@
#endif // defined(WEBGPU_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(WEBGPU_IMPLEMENTATION)
#define WEBGPU_EXPORT __attribute__((visibility("default")))
-#else
-#define WEBGPU_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/gpu/command_buffer/common/gles2_utils_export.h b/gpu/command_buffer/common/gles2_utils_export.h
index fcecbb7d17931..bcbe73f7ac2a5 100644
--- a/gpu/command_buffer/common/gles2_utils_export.h
+++ b/gpu/command_buffer/common/gles2_utils_export.h
@@ -15,11 +15,7 @@
#endif // defined(GLES2_UTILS_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(GLES2_UTILS_IMPLEMENTATION)
#define GLES2_UTILS_EXPORT __attribute__((visibility("default")))
-#else
-#define GLES2_UTILS_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/gpu/gpu_export.h b/gpu/gpu_export.h
index 4bfc01b9f2714..8072ba0965678 100644
--- a/gpu/gpu_export.h
+++ b/gpu/gpu_export.h
@@ -15,11 +15,7 @@
#endif // defined(GPU_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(GPU_IMPLEMENTATION)
#define GPU_EXPORT __attribute__((visibility("default")))
-#else
-#define GPU_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/gpu/gpu_gles2_export.h b/gpu/gpu_gles2_export.h
index f0bd00f3dc078..f5cfa470703c4 100644
--- a/gpu/gpu_gles2_export.h
+++ b/gpu/gpu_gles2_export.h
@@ -15,11 +15,7 @@
#endif // defined(GPU_GLES2_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(GPU_GLES2_IMPLEMENTATION)
#define GPU_GLES2_EXPORT __attribute__((visibility("default")))
-#else
-#define GPU_GLES2_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/gpu/gpu_util_export.h b/gpu/gpu_util_export.h
index d6f5b356764b6..fa22faa503e7b 100644
--- a/gpu/gpu_util_export.h
+++ b/gpu/gpu_util_export.h
@@ -15,11 +15,7 @@
#endif // defined(GPU_UTIL_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(GPU_UTIL_IMPLEMENTATION)
#define GPU_UTIL_EXPORT __attribute__((visibility("default")))
-#else
-#define GPU_UTIL_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/gpu/ipc/gl_in_process_context_export.h b/gpu/ipc/gl_in_process_context_export.h
index 78cf97bdd4383..db9ea37113541 100644
--- a/gpu/ipc/gl_in_process_context_export.h
+++ b/gpu/ipc/gl_in_process_context_export.h
@@ -15,11 +15,7 @@
#endif // defined(GL_IN_PROCESS_CONTEXT_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(GL_IN_PROCESS_CONTEXT_IMPLEMENTATION)
#define GL_IN_PROCESS_CONTEXT_EXPORT __attribute__((visibility("default")))
-#else
-#define GL_IN_PROCESS_CONTEXT_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/gpu/ipc/service/gpu_ipc_service_export.h b/gpu/ipc/service/gpu_ipc_service_export.h
index 04f8eed1c1ffe..65bcd55e97026 100644
--- a/gpu/ipc/service/gpu_ipc_service_export.h
+++ b/gpu/ipc/service/gpu_ipc_service_export.h
@@ -15,11 +15,7 @@
#endif // defined(GPU_IPC_SERVICE_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(GPU_IPC_SERVICE_IMPLEMENTATION)
#define GPU_IPC_SERVICE_EXPORT __attribute__((visibility("default")))
-#else
-#define GPU_IPC_SERVICE_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/gpu/raster_export.h b/gpu/raster_export.h
index 3671d1f1d968f..a6649cf335449 100644
--- a/gpu/raster_export.h
+++ b/gpu/raster_export.h
@@ -15,11 +15,7 @@
#endif // defined(RASTER_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(RASTER_IMPLEMENTATION)
#define RASTER_EXPORT __attribute__((visibility("default")))
-#else
-#define RASTER_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/headless/public/headless_export.h b/headless/public/headless_export.h
index 65c6c7e3f8641..36ba5c26bebbe 100644
--- a/headless/public/headless_export.h
+++ b/headless/public/headless_export.h
@@ -15,11 +15,7 @@
#endif // defined(HEADLESS_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(HEADLESS_IMPLEMENTATION)
#define HEADLESS_EXPORT __attribute__((visibility("default")))
-#else
-#define HEADLESS_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ios/web_view/public/cwv_export.h b/ios/web_view/public/cwv_export.h
index 2c9c6591d381b..ca0e813c23337 100644
--- a/ios/web_view/public/cwv_export.h
+++ b/ios/web_view/public/cwv_export.h
@@ -15,10 +15,6 @@
// This makes it possible to export symbols only when *building* the dynamic
// library (by checking CWV_IMPLEMENTATION), not when *using* the dynamic
// library.
-#if defined(CWV_IMPLEMENTATION)
#define CWV_EXPORT __attribute__((visibility("default")))
-#else
-#define CWV_EXPORT
-#endif
#endif // IOS_WEB_VIEW_PUBLIC_CWV_EXPORT_H_
diff --git a/ipc/ipc_message_support_export.h b/ipc/ipc_message_support_export.h
index d74b52e5e5e45..0b4510014b5ee 100644
--- a/ipc/ipc_message_support_export.h
+++ b/ipc/ipc_message_support_export.h
@@ -16,11 +16,7 @@
#else // defined(WIN32)
-#if defined(IPC_MESSAGE_SUPPORT_IMPL)
#define IPC_MESSAGE_SUPPORT_EXPORT __attribute__((visibility("default")))
-#else
-#define IPC_MESSAGE_SUPPORT_EXPORT
-#endif
#endif
diff --git a/media/base/media_shmem_export.h b/media/base/media_shmem_export.h
index 352d219a47726..52c3e7a6c5ecb 100644
--- a/media/base/media_shmem_export.h
+++ b/media/base/media_shmem_export.h
@@ -18,11 +18,7 @@
#endif // defined(MEDIA_SHMEM_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(MEDIA_SHMEM_IMPLEMENTATION)
#define MEDIA_SHMEM_EXPORT __attribute__((visibility("default")))
-#else
-#define MEDIA_SHMEM_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/media/capture/capture_export.h b/media/capture/capture_export.h
index 980fd103f9c18..5c07a4c8ea4f3 100644
--- a/media/capture/capture_export.h
+++ b/media/capture/capture_export.h
@@ -15,11 +15,7 @@
#endif // defined(CAPTURE_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(CAPTURE_IMPLEMENTATION)
#define CAPTURE_EXPORT __attribute__((visibility("default")))
-#else
-#define CAPTURE_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/media/gpu/media_gpu_export.h b/media/gpu/media_gpu_export.h
index 8c364dc6ddd54..7ed33b7cdf52f 100644
--- a/media/gpu/media_gpu_export.h
+++ b/media/gpu/media_gpu_export.h
@@ -18,11 +18,7 @@
#endif // defined(MEDIA_GPU_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(MEDIA_GPU_IMPLEMENTATION)
#define MEDIA_GPU_EXPORT __attribute__((visibility("default")))
-#else
-#define MEDIA_GPU_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/media/midi/midi_export.h b/media/midi/midi_export.h
index 705b238f4040c..bb4b5338f9e4a 100644
--- a/media/midi/midi_export.h
+++ b/media/midi/midi_export.h
@@ -15,11 +15,7 @@
#endif // defined(MIDI_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(MIDI_IMPLEMENTATION)
#define MIDI_EXPORT __attribute__((visibility("default")))
-#else
-#define MIDI_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/mojo/core/system_impl_export.h b/mojo/core/system_impl_export.h
index 40e51cdd80574..717f442260d1e 100644
--- a/mojo/core/system_impl_export.h
+++ b/mojo/core/system_impl_export.h
@@ -18,11 +18,7 @@
#endif // defined(MOJO_SYSTEM_IMPL_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(MOJO_SYSTEM_IMPL_IMPLEMENTATION)
#define MOJO_SYSTEM_IMPL_EXPORT __attribute__((visibility("default")))
-#else
-#define MOJO_SYSTEM_IMPL_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/mojo/public/c/system/system_export.h b/mojo/public/c/system/system_export.h
index 1bf5d5abb4aac..6529e19271caf 100644
--- a/mojo/public/c/system/system_export.h
+++ b/mojo/public/c/system/system_export.h
@@ -16,11 +16,7 @@
#else // !defined(WIN32)
-#if defined(MOJO_SYSTEM_IMPLEMENTATION)
#define MOJO_SYSTEM_EXPORT __attribute__((visibility("default")))
-#else
-#define MOJO_SYSTEM_EXPORT
-#endif
#endif // defined(WIN32)
diff --git a/mojo/public/cpp/bindings/tests/mojo_test_blink_export.h b/mojo/public/cpp/bindings/tests/mojo_test_blink_export.h
index 864d21905a73b..0295395c4850f 100644
--- a/mojo/public/cpp/bindings/tests/mojo_test_blink_export.h
+++ b/mojo/public/cpp/bindings/tests/mojo_test_blink_export.h
@@ -15,11 +15,7 @@
#endif // defined(MOJO_TEST_BLINK_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(MOJO_TEST_BLINK_IMPLEMENTATION)
#define MOJO_TEST_BLINK_EXPORT __attribute__((visibility("default")))
-#else
-#define MOJO_TEST_BLINK_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/mojo/public/cpp/bindings/tests/mojo_test_export.h b/mojo/public/cpp/bindings/tests/mojo_test_export.h
index 802f808a114fb..c872602898cb0 100644
--- a/mojo/public/cpp/bindings/tests/mojo_test_export.h
+++ b/mojo/public/cpp/bindings/tests/mojo_test_export.h
@@ -15,11 +15,7 @@
#endif // defined(MOJO_TEST_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(MOJO_TEST_IMPLEMENTATION)
#define MOJO_TEST_EXPORT __attribute__((visibility("default")))
-#else
-#define MOJO_TEST_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/net/base/net_export.h b/net/base/net_export.h
index 35e1773fca6f2..ca64828ac9752 100644
--- a/net/base/net_export.h
+++ b/net/base/net_export.h
@@ -21,13 +21,8 @@
#endif // defined(NET_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(NET_IMPLEMENTATION)
#define NET_EXPORT __attribute__((visibility("default")))
#define NET_EXPORT_PRIVATE __attribute__((visibility("default")))
-#else
-#define NET_EXPORT
-#define NET_EXPORT_PRIVATE
-#endif
#endif
#else /// defined(COMPONENT_BUILD)
diff --git a/ppapi/host/ppapi_host_export.h b/ppapi/host/ppapi_host_export.h
index 6bab7e9a75a6f..18c674a10f55a 100644
--- a/ppapi/host/ppapi_host_export.h
+++ b/ppapi/host/ppapi_host_export.h
@@ -15,11 +15,7 @@
#endif // defined(PPAPI_HOST_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(PPAPI_HOST_IMPLEMENTATION)
#define PPAPI_HOST_EXPORT __attribute__((visibility("default")))
-#else
-#define PPAPI_HOST_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ppapi/proxy/ppapi_proxy_export.h b/ppapi/proxy/ppapi_proxy_export.h
index de76892f3eabd..d5aa604a6013b 100644
--- a/ppapi/proxy/ppapi_proxy_export.h
+++ b/ppapi/proxy/ppapi_proxy_export.h
@@ -15,11 +15,7 @@
#endif // defined(PPAPI_PROXY_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(PPAPI_PROXY_IMPLEMENTATION)
#define PPAPI_PROXY_EXPORT __attribute__((visibility("default")))
-#else
-#define PPAPI_PROXY_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ppapi/shared_impl/ppapi_shared_export.h b/ppapi/shared_impl/ppapi_shared_export.h
index dd3686d30a20a..e7308a2847c94 100644
--- a/ppapi/shared_impl/ppapi_shared_export.h
+++ b/ppapi/shared_impl/ppapi_shared_export.h
@@ -15,11 +15,7 @@
#endif // defined(PPAPI_SHARED_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(PPAPI_SHARED_IMPLEMENTATION)
#define PPAPI_SHARED_EXPORT __attribute__((visibility("default")))
-#else
-#define PPAPI_SHARED_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ppapi/thunk/ppapi_thunk_export.h b/ppapi/thunk/ppapi_thunk_export.h
index 9073469e4d4c8..7c1355790b3ae 100644
--- a/ppapi/thunk/ppapi_thunk_export.h
+++ b/ppapi/thunk/ppapi_thunk_export.h
@@ -15,11 +15,7 @@
#endif // defined(PPAPI_THUNK_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(PPAPI_THUNK_IMPLEMENTATION)
#define PPAPI_THUNK_EXPORT __attribute__((visibility("default")))
-#else
-#define PPAPI_THUNK_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/remoting/host/host_export.h b/remoting/host/host_export.h
index 37a50de7a064e..a2476318cf590 100644
--- a/remoting/host/host_export.h
+++ b/remoting/host/host_export.h
@@ -14,11 +14,7 @@
#endif // defined(HOST_IMPLEMENTATION)
#else // !defined(WIN32)
-#if defined(HOST_IMPLEMENTATION)
#define HOST_EXPORT __attribute__((visibility("default")))
-#else
-#define HOST_EXPORT
-#endif // defined(HOST_IMPLEMENTATION)
#endif // !defined(WIN32)
#endif // REMOTING_HOST_HOST_EXPORT_H_
diff --git a/sandbox/mac/seatbelt_export.h b/sandbox/mac/seatbelt_export.h
index 4f3c1963bf15a..4167d93066201 100644
--- a/sandbox/mac/seatbelt_export.h
+++ b/sandbox/mac/seatbelt_export.h
@@ -7,11 +7,7 @@
#if defined(COMPONENT_BUILD)
-#if defined(SEATBELT_IMPLEMENTATION)
#define SEATBELT_EXPORT __attribute__((visibility("default")))
-#else
-#define SEATBELT_EXPORT
-#endif // defined(SEATBELT_IMPLEMENTATION)
#else // defined(COMPONENT_BUILD)
diff --git a/sandbox/policy/export.h b/sandbox/policy/export.h
index fcef8f63531f3..5546afb790216 100644
--- a/sandbox/policy/export.h
+++ b/sandbox/policy/export.h
@@ -15,11 +15,7 @@
#endif // defined(SANDBOX_POLICY_IMPL)
#else // defined(WIN32)
-#if defined(SANDBOX_POLICY_IMPL)
#define SANDBOX_POLICY_EXPORT __attribute__((visibility("default")))
-#else
-#define SANDBOX_POLICY_EXPORT
-#endif // defined(SANDBOX_POLICY_IMPL)
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/sandbox/sandbox_export.h b/sandbox/sandbox_export.h
index 06a2aab0c695b..443da7b5c6919 100644
--- a/sandbox/sandbox_export.h
+++ b/sandbox/sandbox_export.h
@@ -11,11 +11,7 @@
#if defined(COMPONENT_BUILD)
-#if defined(SANDBOX_IMPLEMENTATION)
#define SANDBOX_EXPORT __attribute__((visibility("default")))
-#else
-#define SANDBOX_EXPORT
-#endif // defined(SANDBOX_IMPLEMENTATION)
#else // defined(COMPONENT_BUILD)
diff --git a/services/device/public/cpp/device_features_export.h b/services/device/public/cpp/device_features_export.h
index 7a665428e590a..b13a9ce52b63c 100644
--- a/services/device/public/cpp/device_features_export.h
+++ b/services/device/public/cpp/device_features_export.h
@@ -17,11 +17,7 @@
#else // !defined(WIN32)
-#if defined(DEVICE_FEATURES_IMPLEMENTATION)
#define DEVICE_FEATURES_EXPORT __attribute__((visibility("default")))
-#else
-#define DEVICE_FEATURES_EXPORT
-#endif
#endif
diff --git a/services/metrics/public/cpp/metrics_export.h b/services/metrics/public/cpp/metrics_export.h
index 21e4970b2fb36..5c61fcdaaf464 100644
--- a/services/metrics/public/cpp/metrics_export.h
+++ b/services/metrics/public/cpp/metrics_export.h
@@ -15,11 +15,7 @@
#endif // defined(METRICS_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(METRICS_IMPLEMENTATION)
#define METRICS_EXPORT __attribute__((visibility("default")))
-#else
-#define METRICS_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/services/service_manager/public/cpp/export.h b/services/service_manager/public/cpp/export.h
index 33229a6b78884..5a3f5c30712e8 100644
--- a/services/service_manager/public/cpp/export.h
+++ b/services/service_manager/public/cpp/export.h
@@ -15,11 +15,7 @@
#endif // defined(SERVICE_MANAGER_PUBLIC_CPP_IMPL)
#else // defined(WIN32)
-#if defined(SERVICE_MANAGER_PUBLIC_CPP_IMPL)
#define SERVICE_MANAGER_PUBLIC_CPP_EXPORT __attribute__((visibility("default")))
-#else
-#define SERVICE_MANAGER_PUBLIC_CPP_EXPORT
-#endif // defined(SERVICE_MANAGER_PUBLIC_CPP_IMPL)
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/skia/ext/switches_export.h b/skia/ext/switches_export.h
index 2301d3c5b6ce7..720a1f60b72af 100644
--- a/skia/ext/switches_export.h
+++ b/skia/ext/switches_export.h
@@ -15,11 +15,7 @@
#endif // defined(SKIA_SWITCHES_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(SKIA_SWITCHES_IMPLEMENTATION)
#define SKIA_SWITCHES_EXPORT __attribute__((visibility("default")))
-#else
-#define SKIA_SWITCHES_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/accelerated_widget_mac/accelerated_widget_mac_export.h b/ui/accelerated_widget_mac/accelerated_widget_mac_export.h
index 181e822b5ac8b..18991797d0666 100644
--- a/ui/accelerated_widget_mac/accelerated_widget_mac_export.h
+++ b/ui/accelerated_widget_mac/accelerated_widget_mac_export.h
@@ -11,11 +11,7 @@
#if defined(COMPONENT_BUILD)
-#if defined(ACCELERATED_WIDGET_MAC_IMPLEMENTATION)
#define ACCELERATED_WIDGET_MAC_EXPORT __attribute__((visibility("default")))
-#else
-#define ACCELERATED_WIDGET_MAC_EXPORT
-#endif
#else // defined(COMPONENT_BUILD)
#define ACCELERATED_WIDGET_MAC_EXPORT
diff --git a/ui/accessibility/ax_base_export.h b/ui/accessibility/ax_base_export.h
index b25d5d40f7d26..2a44095cc95d3 100644
--- a/ui/accessibility/ax_base_export.h
+++ b/ui/accessibility/ax_base_export.h
@@ -13,8 +13,7 @@
#define AX_BASE_EXPORT __declspec(dllexport)
#elif defined(COMPONENT_BUILD) && defined(WIN32)
#define AX_BASE_EXPORT __declspec(dllimport)
-#elif defined(COMPONENT_BUILD) && !defined(WIN32) && \
- defined(AX_BASE_IMPLEMENTATION)
+#elif defined(COMPONENT_BUILD)
#define AX_BASE_EXPORT __attribute__((visibility("default")))
#else
#define AX_BASE_EXPORT
diff --git a/ui/accessibility/ax_export.h b/ui/accessibility/ax_export.h
index ad444a458c6bd..bf998e8d6b1a2 100644
--- a/ui/accessibility/ax_export.h
+++ b/ui/accessibility/ax_export.h
@@ -12,7 +12,7 @@
#define AX_EXPORT __declspec(dllexport)
#elif defined(COMPONENT_BUILD) && defined(WIN32)
#define AX_EXPORT __declspec(dllimport)
-#elif defined(COMPONENT_BUILD) && !defined(WIN32) && defined(AX_IMPLEMENTATION)
+#elif defined(COMPONENT_BUILD)
#define AX_EXPORT __attribute__((visibility("default")))
#else
#define AX_EXPORT
diff --git a/ui/android/ui_android_export.h b/ui/android/ui_android_export.h
index 9f600e90e2f09..b5a3c5b9bbbec 100644
--- a/ui/android/ui_android_export.h
+++ b/ui/android/ui_android_export.h
@@ -13,19 +13,11 @@
#if defined(WIN32)
#error Unsupported target architecture.
#else // !defined(WIN32)
-
-#if defined(UI_ANDROID_IMPLEMENTATION)
#define UI_ANDROID_EXPORT __attribute__((visibility("default")))
-#else
-#define UI_ANDROID_EXPORT
-#endif
-
#endif
#else // !defined(COMPONENT_BUILD)
-
#define UI_ANDROID_EXPORT
-
#endif
#endif // UI_ANDROID_UI_ANDROID_EXPORT_H_
diff --git a/ui/aura/aura_export.h b/ui/aura/aura_export.h
index be6a08a77a1e6..90ebdf820d99b 100644
--- a/ui/aura/aura_export.h
+++ b/ui/aura/aura_export.h
@@ -18,11 +18,7 @@
#endif // defined(AURA_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(AURA_IMPLEMENTATION)
#define AURA_EXPORT __attribute__((visibility("default")))
-#else
-#define AURA_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/aura_extra/aura_extra_export.h b/ui/aura_extra/aura_extra_export.h
index 5d95d4db3218a..1773417fef73d 100644
--- a/ui/aura_extra/aura_extra_export.h
+++ b/ui/aura_extra/aura_extra_export.h
@@ -18,11 +18,7 @@
#endif // defined(AURA_EXTRA_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(AURA_EXTRA_IMPLEMENTATION)
#define AURA_EXTRA_EXPORT __attribute__((visibility("default")))
-#else
-#define AURA_EXTRA_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/chromeos/ui_chromeos_export.h b/ui/chromeos/ui_chromeos_export.h
index 429a9a881d714..4c14018697038 100644
--- a/ui/chromeos/ui_chromeos_export.h
+++ b/ui/chromeos/ui_chromeos_export.h
@@ -6,11 +6,7 @@
#define UI_CHROMEOS_UI_CHROMEOS_EXPORT_H_
#if defined(COMPONENT_BUILD)
-#if defined(UI_CHROMEOS_IMPLEMENTATION)
#define UI_CHROMEOS_EXPORT __attribute__((visibility("default")))
-#else
-#define UI_CHROMEOS_EXPORT
-#endif
#else // defined(COMPONENT_BUILD)
#define UI_CHROMEOS_EXPORT
diff --git a/ui/compositor/compositor_export.h b/ui/compositor/compositor_export.h
index 02e4784c86e8d..1838327547b24 100644
--- a/ui/compositor/compositor_export.h
+++ b/ui/compositor/compositor_export.h
@@ -15,11 +15,7 @@
#endif // defined(COMPOSITOR_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(COMPOSITOR_IMPLEMENTATION)
#define COMPOSITOR_EXPORT __attribute__((visibility("default")))
-#else
-#define COMPOSITOR_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/display/display_export.h b/ui/display/display_export.h
index 443e9f895457f..c3087e47cd93f 100644
--- a/ui/display/display_export.h
+++ b/ui/display/display_export.h
@@ -20,11 +20,7 @@
#else // !defined(WIN32)
-#if defined(DISPLAY_IMPLEMENTATION)
#define DISPLAY_EXPORT __attribute__((visibility("default")))
-#else
-#define DISPLAY_EXPORT
-#endif
#endif
diff --git a/ui/display/manager/display_manager_export.h b/ui/display/manager/display_manager_export.h
index de4272b94680f..09af89e73bd1f 100644
--- a/ui/display/manager/display_manager_export.h
+++ b/ui/display/manager/display_manager_export.h
@@ -15,11 +15,7 @@
#endif
#else // !defined(WIN32)
-#if defined(DISPLAY_MANAGER_IMPLEMENTATION)
#define DISPLAY_MANAGER_EXPORT __attribute__((visibility("default")))
-#else
-#define DISPLAY_MANAGER_EXPORT
-#endif
#endif
#else // !defined(COMPONENT_BUILD)
diff --git a/ui/display/types/display_types_export.h b/ui/display/types/display_types_export.h
index 3637ea4a6793e..9680a246ca866 100644
--- a/ui/display/types/display_types_export.h
+++ b/ui/display/types/display_types_export.h
@@ -20,11 +20,7 @@
#else // !defined(WIN32)
-#if defined(DISPLAY_TYPES_IMPLEMENTATION)
#define DISPLAY_TYPES_EXPORT __attribute__((visibility("default")))
-#else
-#define DISPLAY_TYPES_EXPORT
-#endif
#endif
diff --git a/ui/display/util/display_util_export.h b/ui/display/util/display_util_export.h
index 27248eb388cfc..51f58f4046ab3 100644
--- a/ui/display/util/display_util_export.h
+++ b/ui/display/util/display_util_export.h
@@ -20,11 +20,7 @@
#else // !defined(WIN32)
-#if defined(DISPLAY_UTIL_IMPLEMENTATION)
#define DISPLAY_UTIL_EXPORT __attribute__((visibility("default")))
-#else
-#define DISPLAY_UTIL_EXPORT
-#endif
#endif
diff --git a/ui/events/devices/events_devices_export.h b/ui/events/devices/events_devices_export.h
index 3f210d3340ad8..f4990ce08b1b1 100644
--- a/ui/events/devices/events_devices_export.h
+++ b/ui/events/devices/events_devices_export.h
@@ -15,11 +15,7 @@
#endif // defined(EVENTS_DEVICES_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(EVENTS_DEVICES_IMPLEMENTATION)
#define EVENTS_DEVICES_EXPORT __attribute__((visibility("default")))
-#else
-#define EVENTS_DEVICES_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/events/devices/x11/events_devices_x11_export.h b/ui/events/devices/x11/events_devices_x11_export.h
index 04087e077205a..0ccae8a731c4c 100644
--- a/ui/events/devices/x11/events_devices_x11_export.h
+++ b/ui/events/devices/x11/events_devices_x11_export.h
@@ -15,11 +15,7 @@
#endif // defined(EVENTS_DEVICES_X11_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(EVENTS_DEVICES_X11_IMPLEMENTATION)
#define EVENTS_DEVICES_X11_EXPORT __attribute__((visibility("default")))
-#else
-#define EVENTS_DEVICES_X11_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/events/events_base_export.h b/ui/events/events_base_export.h
index 800a4e8d9a6ba..830af7971a3e7 100644
--- a/ui/events/events_base_export.h
+++ b/ui/events/events_base_export.h
@@ -15,11 +15,7 @@
#endif // defined(EVENTS_BASE_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(EVENTS_BASE_IMPLEMENTATION)
#define EVENTS_BASE_EXPORT __attribute__((visibility("default")))
-#else
-#define EVENTS_BASE_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/events/events_export.h b/ui/events/events_export.h
index a926b0f56f215..c79179652b756 100644
--- a/ui/events/events_export.h
+++ b/ui/events/events_export.h
@@ -15,11 +15,7 @@
#endif // defined(EVENTS_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(EVENTS_IMPLEMENTATION)
#define EVENTS_EXPORT __attribute__((visibility("default")))
-#else
-#define EVENTS_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/events/gesture_detection/gesture_detection_export.h b/ui/events/gesture_detection/gesture_detection_export.h
index 278bbc072ef02..5e80720feb2cc 100644
--- a/ui/events/gesture_detection/gesture_detection_export.h
+++ b/ui/events/gesture_detection/gesture_detection_export.h
@@ -15,11 +15,7 @@
#endif // defined(GESTURES_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(GESTURE_DETECTION_IMPLEMENTATION)
#define GESTURE_DETECTION_EXPORT __attribute__((visibility("default")))
-#else
-#define GESTURE_DETECTION_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/events/keycodes/keycodes_x_export.h b/ui/events/keycodes/keycodes_x_export.h
index d0a215912ed6c..567015ed07e58 100644
--- a/ui/events/keycodes/keycodes_x_export.h
+++ b/ui/events/keycodes/keycodes_x_export.h
@@ -15,11 +15,7 @@
#endif // defined(KEYCODES_X_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(KEYCODES_X_IMPLEMENTATION)
#define KEYCODES_X_EXPORT __attribute__((visibility("default")))
-#else
-#define KEYCODES_X_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/events/x/events_x_export.h b/ui/events/x/events_x_export.h
index c0ccb0645c52b..fb900ad9cff4f 100644
--- a/ui/events/x/events_x_export.h
+++ b/ui/events/x/events_x_export.h
@@ -15,11 +15,7 @@
#endif // defined(EVENTS_X_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(EVENTS_X_IMPLEMENTATION)
#define EVENTS_X_EXPORT __attribute__((visibility("default")))
-#else
-#define EVENTS_X_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/file_manager/file_manager_export.h b/ui/file_manager/file_manager_export.h
index 41d67085b7eab..f46a1b5f3b0bb 100644
--- a/ui/file_manager/file_manager_export.h
+++ b/ui/file_manager/file_manager_export.h
@@ -18,11 +18,7 @@
#endif // defined(FILE_MANAGER_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(FILE_MANAGER_IMPLEMENTATION)
#define FILE_MANAGER_EXPORT __attribute__((visibility("default")))
-#else
-#define FILE_MANAGER_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/gfx/animation/animation_export.h b/ui/gfx/animation/animation_export.h
index 586d5d862e5a5..0a533369c6851 100644
--- a/ui/gfx/animation/animation_export.h
+++ b/ui/gfx/animation/animation_export.h
@@ -15,11 +15,7 @@
#endif // defined(ANIMATION_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(ANIMATION_IMPLEMENTATION)
#define ANIMATION_EXPORT __attribute__((visibility("default")))
-#else
-#define ANIMATION_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/gfx/animation/keyframe/keyframe_animation_export.h b/ui/gfx/animation/keyframe/keyframe_animation_export.h
index 518c84a1d1b93..571b9f27df9f6 100644
--- a/ui/gfx/animation/keyframe/keyframe_animation_export.h
+++ b/ui/gfx/animation/keyframe/keyframe_animation_export.h
@@ -15,11 +15,7 @@
#endif // defined(CC_ANIMATION_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(GFX_KEYFRAME_ANIMATION_IMPLEMENTATION)
#define GFX_KEYFRAME_ANIMATION_EXPORT __attribute__((visibility("default")))
-#else
-#define GFX_KEYFRAME_ANIMATION_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/gfx/codec/codec_export.h b/ui/gfx/codec/codec_export.h
index 76b31443aebfc..083dfb6058cb3 100644
--- a/ui/gfx/codec/codec_export.h
+++ b/ui/gfx/codec/codec_export.h
@@ -15,11 +15,7 @@
#endif // defined(CODEC_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(CODEC_IMPLEMENTATION)
#define CODEC_EXPORT __attribute__((visibility("default")))
-#else
-#define CODEC_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/gfx/color_space_export.h b/ui/gfx/color_space_export.h
index 2474ed93b106a..b253d38309ea5 100644
--- a/ui/gfx/color_space_export.h
+++ b/ui/gfx/color_space_export.h
@@ -15,11 +15,7 @@
#endif // defined(COLOR_SPACE_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(COLOR_SPACE_IMPLEMENTATION)
#define COLOR_SPACE_EXPORT __attribute__((visibility("default")))
-#else
-#define COLOR_SPACE_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/gfx/gfx_skia_export.h b/ui/gfx/gfx_skia_export.h
index 7287f48bdafb8..6e9e8278cbcf9 100644
--- a/ui/gfx/gfx_skia_export.h
+++ b/ui/gfx/gfx_skia_export.h
@@ -15,11 +15,7 @@
#endif // defined(GEOMETRY_SKIA_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(GFX_SKIA_IMPLEMENTATION)
#define GFX_SKIA_EXPORT __attribute__((visibility("default")))
-#else
-#define GFX_SKIA_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/gfx/ipc/buffer_types/gfx_ipc_export.h b/ui/gfx/ipc/buffer_types/gfx_ipc_export.h
index ba99e9fd21ddf..4fad60a3eb6e4 100644
--- a/ui/gfx/ipc/buffer_types/gfx_ipc_export.h
+++ b/ui/gfx/ipc/buffer_types/gfx_ipc_export.h
@@ -15,11 +15,7 @@
#endif // defined(GFX_IPC_BUFFER_TYPES_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(GFX_IPC_BUFFER_TYPES_IMPLEMENTATION)
#define GFX_IPC_BUFFER_TYPES_EXPORT __attribute__((visibility("default")))
-#else
-#define GFX_IPC_BUFFER_TYPES_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/gfx/ipc/color/gfx_ipc_color_export.h b/ui/gfx/ipc/color/gfx_ipc_color_export.h
index 4ba0e11d86576..0c0526ee73e3b 100644
--- a/ui/gfx/ipc/color/gfx_ipc_color_export.h
+++ b/ui/gfx/ipc/color/gfx_ipc_color_export.h
@@ -15,11 +15,7 @@
#endif // defined(GFX_IPC_COLOR_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(GFX_IPC_COLOR_IMPLEMENTATION)
#define GFX_IPC_COLOR_EXPORT __attribute__((visibility("default")))
-#else
-#define GFX_IPC_COLOR_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/gfx/ipc/geometry/gfx_ipc_geometry_export.h b/ui/gfx/ipc/geometry/gfx_ipc_geometry_export.h
index 912a3b1ea204d..49d69087bb572 100644
--- a/ui/gfx/ipc/geometry/gfx_ipc_geometry_export.h
+++ b/ui/gfx/ipc/geometry/gfx_ipc_geometry_export.h
@@ -15,11 +15,7 @@
#endif // defined(GFX_IPC_GEOMETRY_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(GFX_IPC_GEOMETRY_IMPLEMENTATION)
#define GFX_IPC_GEOMETRY_EXPORT __attribute__((visibility("default")))
-#else
-#define GFX_IPC_GEOMETRY_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/gfx/ipc/gfx_ipc_export.h b/ui/gfx/ipc/gfx_ipc_export.h
index 6cd3002e2915f..c8aa3947e8b7f 100644
--- a/ui/gfx/ipc/gfx_ipc_export.h
+++ b/ui/gfx/ipc/gfx_ipc_export.h
@@ -15,11 +15,7 @@
#endif // defined(GFX_IPC_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(GFX_IPC_IMPLEMENTATION)
#define GFX_IPC_EXPORT __attribute__((visibility("default")))
-#else
-#define GFX_IPC_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/gfx/ipc/skia/gfx_skia_ipc_export.h b/ui/gfx/ipc/skia/gfx_skia_ipc_export.h
index 0872eef978917..bdfc9e0ab58fb 100644
--- a/ui/gfx/ipc/skia/gfx_skia_ipc_export.h
+++ b/ui/gfx/ipc/skia/gfx_skia_ipc_export.h
@@ -15,11 +15,7 @@
#endif // defined(GFX_SKIA_IPC_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(GFX_SKIA_IPC_IMPLEMENTATION)
#define GFX_SKIA_IPC_EXPORT __attribute__((visibility("default")))
-#else
-#define GFX_SKIA_IPC_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/gfx/range/gfx_range_export.h b/ui/gfx/range/gfx_range_export.h
index db3491e4ec024..fcf717fd60029 100644
--- a/ui/gfx/range/gfx_range_export.h
+++ b/ui/gfx/range/gfx_range_export.h
@@ -15,11 +15,7 @@
#endif // defined(GFX_RANGE_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(GFX_RANGE_IMPLEMENTATION)
#define GFX_RANGE_EXPORT __attribute__((visibility("default")))
-#else
-#define GFX_RANGE_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/gfx/switches_export.h b/ui/gfx/switches_export.h
index ba153f2b53ccf..da608aadabf97 100644
--- a/ui/gfx/switches_export.h
+++ b/ui/gfx/switches_export.h
@@ -15,11 +15,7 @@
#endif // defined(GFX_SWITCHES_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(GFX_SWITCHES_IMPLEMENTATION)
#define GFX_SWITCHES_EXPORT __attribute__((visibility("default")))
-#else
-#define GFX_SWITCHES_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/gl/gl_export.h b/ui/gl/gl_export.h
index e7e7cd338122a..9d1f1c8c4ce42 100644
--- a/ui/gl/gl_export.h
+++ b/ui/gl/gl_export.h
@@ -15,11 +15,7 @@
#endif // defined(GL_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(GL_IMPLEMENTATION)
#define GL_EXPORT __attribute__((visibility("default")))
-#else
-#define GL_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/gl/init/gl_init_export.h b/ui/gl/init/gl_init_export.h
index 1a6fe98c085ca..e14db38aed7dc 100644
--- a/ui/gl/init/gl_init_export.h
+++ b/ui/gl/init/gl_init_export.h
@@ -15,11 +15,7 @@
#endif // defined(GL_INIT_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(GL_INIT_IMPLEMENTATION)
#define GL_INIT_EXPORT __attribute__((visibility("default")))
-#else
-#define GL_INIT_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/message_center/message_center_export.h b/ui/message_center/message_center_export.h
index 3893917c4691b..a4aa3ebbb6b47 100644
--- a/ui/message_center/message_center_export.h
+++ b/ui/message_center/message_center_export.h
@@ -18,11 +18,7 @@
#endif // defined(MESSAGE_CENTER_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(MESSAGE_CENTER_IMPLEMENTATION)
#define MESSAGE_CENTER_EXPORT __attribute__((visibility("default")))
-#else
-#define MESSAGE_CENTER_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/message_center/public/cpp/message_center_public_export.h b/ui/message_center/public/cpp/message_center_public_export.h
index 553574e516b95..2dff2ac6425d4 100644
--- a/ui/message_center/public/cpp/message_center_public_export.h
+++ b/ui/message_center/public/cpp/message_center_public_export.h
@@ -18,11 +18,7 @@
#endif // defined(MESSAGE_CENTER_PUBLIC_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(MESSAGE_CENTER_PUBLIC_IMPLEMENTATION)
#define MESSAGE_CENTER_PUBLIC_EXPORT __attribute__((visibility("default")))
-#else
-#define MESSAGE_CENTER_PUBLIC_EXPORT
-#endif // defined(MESSAGE_CENTER_PUBLIC_IMPLEMENTATION)
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/platform_window/stub/stub_window_export.h b/ui/platform_window/stub/stub_window_export.h
index cf3f3ad9e8fbe..33bf2b98a01f8 100644
--- a/ui/platform_window/stub/stub_window_export.h
+++ b/ui/platform_window/stub/stub_window_export.h
@@ -15,11 +15,7 @@
#endif // defined(STUB_WINDOW_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(STUB_WINDOW_IMPLEMENTATION)
#define STUB_WINDOW_EXPORT __attribute__((visibility("default")))
-#else
-#define STUB_WINDOW_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/platform_window/win/win_window_export.h b/ui/platform_window/win/win_window_export.h
index 09c5839729229..9b5b28ad0d9bc 100644
--- a/ui/platform_window/win/win_window_export.h
+++ b/ui/platform_window/win/win_window_export.h
@@ -15,11 +15,7 @@
#endif // defined(WIN_WINDOW_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(WIN_WINDOW_IMPLEMENTATION)
#define WIN_WINDOW_EXPORT __attribute__((visibility("default")))
-#else
-#define WIN_WINDOW_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/shell_dialogs/shell_dialogs_export.h b/ui/shell_dialogs/shell_dialogs_export.h
index 2555a8f590df5..03a5e9dbf1736 100644
--- a/ui/shell_dialogs/shell_dialogs_export.h
+++ b/ui/shell_dialogs/shell_dialogs_export.h
@@ -18,11 +18,7 @@
#endif // defined(SHELL_DIALOGS_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(SHELL_DIALOGS_IMPLEMENTATION)
#define SHELL_DIALOGS_EXPORT __attribute__((visibility("default")))
-#else
-#define SHELL_DIALOGS_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/snapshot/snapshot_export.h b/ui/snapshot/snapshot_export.h
index 07df7763a4878..d3ad90ace012d 100644
--- a/ui/snapshot/snapshot_export.h
+++ b/ui/snapshot/snapshot_export.h
@@ -18,11 +18,7 @@
#endif // defined(SNAPSHOT_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(SNAPSHOT_IMPLEMENTATION)
#define SNAPSHOT_EXPORT __attribute__((visibility("default")))
-#else
-#define SNAPSHOT_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/surface/surface_export.h b/ui/surface/surface_export.h
index c1d62f86d8695..662af5e3c1c78 100644
--- a/ui/surface/surface_export.h
+++ b/ui/surface/surface_export.h
@@ -15,11 +15,7 @@
#endif // defined(SURFACE_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(SURFACE_IMPLEMENTATION)
#define SURFACE_EXPORT __attribute__((visibility("default")))
-#else
-#define SURFACE_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/touch_selection/ui_touch_selection_export.h b/ui/touch_selection/ui_touch_selection_export.h
index 160bc37da5511..b80d887d59099 100644
--- a/ui/touch_selection/ui_touch_selection_export.h
+++ b/ui/touch_selection/ui_touch_selection_export.h
@@ -22,11 +22,7 @@
#else // !defined(WIN32)
-#if defined(UI_TOUCH_SELECTION_IMPLEMENTATION)
#define UI_TOUCH_SELECTION_EXPORT __attribute__((visibility("default")))
-#else
-#define UI_TOUCH_SELECTION_EXPORT
-#endif
#endif
diff --git a/ui/views/controls/webview/webview_export.h b/ui/views/controls/webview/webview_export.h
index 5673b3b219326..919ec106faba8 100644
--- a/ui/views/controls/webview/webview_export.h
+++ b/ui/views/controls/webview/webview_export.h
@@ -18,11 +18,7 @@
#endif // defined(WEBVIEW_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(WEBVIEW_IMPLEMENTATION)
#define WEBVIEW_EXPORT __attribute__((visibility("default")))
-#else
-#define WEBVIEW_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/views/examples/views_examples_export.h b/ui/views/examples/views_examples_export.h
index 4d3ea7c4dca31..8471cb9f854d4 100644
--- a/ui/views/examples/views_examples_export.h
+++ b/ui/views/examples/views_examples_export.h
@@ -18,11 +18,7 @@
#endif // defined(VIEWS_EXAMPLES_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(VIEWS_EXAMPLES_IMPLEMENTATION)
#define VIEWS_EXAMPLES_EXPORT __attribute__((visibility("default")))
-#else
-#define VIEWS_EXAMPLES_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/views/views_export.h b/ui/views/views_export.h
index 218900b87110c..2bc88a45f8612 100644
--- a/ui/views/views_export.h
+++ b/ui/views/views_export.h
@@ -18,11 +18,7 @@
#endif // defined(VIEWS_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(VIEWS_IMPLEMENTATION)
#define VIEWS_EXPORT __attribute__((visibility("default")))
-#else
-#define VIEWS_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/views_content_client/views_content_client_export.h b/ui/views_content_client/views_content_client_export.h
index 8e05789f4a47e..43ac07727e463 100644
--- a/ui/views_content_client/views_content_client_export.h
+++ b/ui/views_content_client/views_content_client_export.h
@@ -18,11 +18,7 @@
#endif // defined(VIEWS_CONTENT_CLIENT_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(VIEWS_CONTENT_CLIENT_IMPLEMENTATION)
#define VIEWS_CONTENT_CLIENT_EXPORT __attribute__((visibility("default")))
-#else
-#define VIEWS_CONTENT_CLIENT_EXPORT
-#endif
#endif // defined(VIEWS_CONTENT_CLIENT_IMPLEMENTATION)
#else // defined(COMPONENT_BUILD)
diff --git a/ui/web_dialogs/web_dialogs_export.h b/ui/web_dialogs/web_dialogs_export.h
index a8d990eea33f6..7f616cf687550 100644
--- a/ui/web_dialogs/web_dialogs_export.h
+++ b/ui/web_dialogs/web_dialogs_export.h
@@ -18,11 +18,7 @@
#endif // defined(WEB_DIALOGS_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(WEB_DIALOGS_IMPLEMENTATION)
#define WEB_DIALOGS_EXPORT __attribute__((visibility("default")))
-#else
-#define WEB_DIALOGS_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/ui/wm/public/wm_public_export.h b/ui/wm/public/wm_public_export.h
index b3763336ec091..582ee094524f0 100644
--- a/ui/wm/public/wm_public_export.h
+++ b/ui/wm/public/wm_public_export.h
@@ -18,11 +18,7 @@
#endif // defined(WM_PUBLIC_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(WM_PUBLIC_IMPLEMENTATION)
#define WM_PUBLIC_EXPORT __attribute__((visibility("default")))
-#else
-#define WM_PUBLIC_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)
diff --git a/url/ipc/url_ipc_export.h b/url/ipc/url_ipc_export.h
index ca500ab0c9038..3780fc9f39824 100644
--- a/url/ipc/url_ipc_export.h
+++ b/url/ipc/url_ipc_export.h
@@ -15,11 +15,7 @@
#endif // defined(URL_IPC_IMPLEMENTATION)
#else // defined(WIN32)
-#if defined(URL_IPC_IMPLEMENTATION)
#define URL_IPC_EXPORT __attribute__((visibility("default")))
-#else
-#define URL_IPC_EXPORT
-#endif
#endif
#else // defined(COMPONENT_BUILD)