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

@@ -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

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

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

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)

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

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)

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

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)

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

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_

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)

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)

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)

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)

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)

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)

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)

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)

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)
 

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)

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)

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)

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_

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)

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)

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)

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
 

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)

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)

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_

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)

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)

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)

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)

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)

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)

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)

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_

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)

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)
 

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_

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_

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)

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)

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)

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

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

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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_

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

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

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

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
 

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

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)

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

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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_

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
 

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)

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)

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)

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)

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)

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)
 

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)

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)

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)

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)

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)

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)

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)