Bug 869832 followup, use the test window's gBrowser
Bug 870959 - don't include Preferences.h or NonRefcountedDOMObject.h in bindings unless necessary; r=bz
Backout 385c05262943 for android robocop failures.

--HG--
extra : rebase_source : f315f7b4cd3b998baa4ffb5546bec914409092e9