Fix npapi plugin detection
s/is_linux/(is_linux or is_bsd)/ in theme_resources.grd
Merge branch 'beta' of github.com:gliaskos/freebsd-chromium into beta