Gardening: Adopt to latest changes.

Effecting CL:
https://codereview.chromium.org/274273004
https://codereview.chromium.org/278823004
https://codereview.chromium.org/274633003