GitLab

Add local modifications to remove one unused method, and reimplement
another using a non-deprecated API.

Bug: 1153883
Change-Id: Iad59c5e798e440aa256e81f9f4ee79cfa05310e5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2566154Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#832076}