Server push cancellation: clean up the code to make sure shared code is in sync with internal code.

Merge internal change: 138927579.

BUG=232040

Review-Url: https://codereview.chromium.org/2497083002
Cr-Commit-Position: refs/heads/master@{#431731}
9 files changed