Bug 850221 - Hide a per-window private browsing test behind the build-time define, and update non-private browsing code to account for per-window changes. r=ehsan a=lsblakk