Bug 603632 - Reduce the dependency between browser-chrome private browsing tests; r=dolske a=NPOTB

browser/components/privatebrowsing/test/browser/Makefile.in

@@ -45,6 +45,7 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _BROWSER_TEST_FILES =  \
+		head.js \
 		browser_console_clear.js \
 		browser_privatebrowsing_certexceptionsui.js \
 		browser_privatebrowsing_commandline_toggle.js \

browser/components/privatebrowsing/test/browser/head.js

@@ -0,0 +1,11 @@
+// Make sure that we clean up after each test if it times out, for example.
+registerCleanupFunction(function() {
+  var pb = Cc["@mozilla.org/privatebrowsing;1"].
+           getService(Ci.nsIPrivateBrowsingService);
+  ok(!pb.privateBrowsingEnabled, "Private browsing should be terminated after finishing the test");
+  pb.privateBrowsingEnabled = false;
+  try {
+    Services.prefs.clearUserPref("browser.privatebrowsing.keep_current_session");
+  } catch(e) {}
+});
+