Backout 118283:8d16c92e1bf4 (bug 827801) because two patches have landed adding the same test
Bug 828114: Set a timer to ensure content processes are killed if their tabs take a long time to shut down. r=jlebar a=blocking-basecamp