Commit 96bd40c0 authored by Nico Weber's avatar Nico Weber Committed by Commit Bot

win: Remove GOOGLE_CHROME_BUILD from factors determining COM_INIT_CHECK_HOOK_ENABLED

GOOGLE_CHROME_BUILD is more a branding thing. Since
COM_INIT_CHECK_HOOK_ENABLED is also gated on OFFICIAL_BUILD
(which is more an optimization thing), this doesn't have an effect on
production Chrome.

Branded builds without official build optimizations will get
the com init check hook after this CL, but likely very few people
build in that configuration, and it shouldn't matter much for them.

Bug: 961769
Change-Id: Ib7dd98843c33c6571b53cd0007d260af422e0976
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1864718
Auto-Submit: Nico Weber <thakis@chromium.org>
Commit-Queue: Robert Liao <robliao@chromium.org>
Reviewed-by: default avatarRobert Liao <robliao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706702}
parent 4716b2f0
......@@ -22,8 +22,7 @@ namespace win {
// 64-bit binaries.
#if DCHECK_IS_ON() && defined(ARCH_CPU_X86_FAMILY) && \
defined(ARCH_CPU_32_BITS) && !defined(GOOGLE_CHROME_BUILD) && \
!defined(OFFICIAL_BUILD) && \
defined(ARCH_CPU_32_BITS) && !defined(OFFICIAL_BUILD) && \
!defined(COM_INIT_CHECK_HOOK_DISABLED) // See crbug/737090 for details.
#define COM_INIT_CHECK_HOOK_ENABLED
#endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment