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

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

Merge internal change: 138927579.

BUG=232040
Committed: https://crrev.com/1cbc95beeba6502738dbe017f48c31316a2aa4ce
Cr-Commit-Position: refs/heads/master@{#431731}

[Zhongyi Shi, 2016-11-12 00:28:23]

zhongyi@chromium.org changed reviewers:
+ rch@chromium.org

[Ryan Hamilton, 2016-11-12 00:52:54]

The CQ bit was checked by rch@chromium.org

[Ryan Hamilton, 2016-11-12 00:52:55]

lgtm

[commit-bot: I haz the power, 2016-11-12 00:53:22]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-11-12 01:43:16]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2016-11-12 01:45:34]

Description was changed from

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

Merge internal change: 138927579.

BUG=232040
==========

to

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

Merge internal change: 138927579.

BUG=232040

Committed: https://crrev.com/1cbc95beeba6502738dbe017f48c31316a2aa4ce
Cr-Commit-Position: refs/heads/master@{#431731}
==========

[commit-bot: I haz the power, 2016-11-12 01:45:35]

Patchset 1 (id:??) landed as
https://crrev.com/1cbc95beeba6502738dbe017f48c31316a2aa4ce
Cr-Commit-Position: refs/heads/master@{#431731}