GitLab

Remove deprecated macro usage and use explicit deletions instead. Also
remove some unnecessary includes for base/macros.h.

Bug: 1010217
Change-Id: I8d1e4d03e93933262f184b7802de4ef1b94ab1e0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2363630Reviewed-by: Daniel Hosseinian <dhoss@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799850}