Gardening: make the code build with 34.0.1847.45.

Effecting CLs:
https://codereview.chromium.org/136093007
https://codereview.chromium.org/167563004
https://codereview.chromium.org/152083004