Back out bug 863646 for make check orange (TestStartupCache).
Back out bug 860438 nsWindowWatcher patch for ProfileManager crashes.

This reverts commit 2aec46b29d41c457b5b192ff51a448eb98598e20.