Refactored env variable lookup out of browser factory

Change-Id: I05d2ea23607ed22f216d63a77c5e2bacdac40261