M35 Garderning : Adapt to new content API

https://codereview.chromium.org/187223003 : I just followed upstream.