Merge pull request #3801 from Rob--W/hotfix/crx-ubuntu

chrome.extension -> chrome.runtime for Ubuntu
chrome.runtime -> chrome.extension when needed

Some Ubuntu users are still stuck at Chromium 25.