GitLab

This is a fixup for b2af6d84.

- add/remove macros.
- avoid inline virtual function.

Bug: b/162546246
Bug: b/173504008
Test: None
Change-Id: I3aa2767efc30bf0e677462f395be50dbefc4117f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2581438Reviewed-by: Sean Topping <seantopping@chromium.org>
Commit-Queue: Mingyu Kang <kenkangxgwe@google.com>
Cr-Commit-Position: refs/heads/master@{#835316}