Bug 951883 - Part 1: Revert name of BrowserProvider. r=me

--HG--
extra : rebase_source : 554a609e6b114e1ac490a4d0136cb1b9d74e68fa
Bug 951883 - Part 2: Remove temporary compile time guards. r=me

--HG--
extra : rebase_source : 51325eeea8fc1d5b2e7cd84e8977072b030496c8