chromium.py: Rebase to r296898