Bug 735557 - Add about:preferences to the inContentWhitelist. r=bmcbride

browser/base/content/browser.js

@@ -4516,7 +4516,8 @@ var XULBrowserWindow = {
   startTime: 0,
   statusText: "",
   isBusy: false,
-  inContentWhitelist: ["about:addons", "about:permissions", "about:sync-progress"],
+  inContentWhitelist: ["about:addons", "about:permissions", 
+                       "about:sync-progress", "about:preferences"],
 
   QueryInterface: function (aIID) {
     if (aIID.equals(Ci.nsIWebProgressListener) ||

browser/base/content/test/browser_disablechrome.js

@@ -187,5 +187,30 @@ function run_http_test4() {
 
 function run_chrome_about_test_4() {
   info("Chrome about: tests");
-  test_url("about:Addons", true, end_test);
+  test_url("about:Addons", true, run_http_test5);
+ }
+
+function run_http_test5() {
+  info("HTTP tests");
+  test_url(HTTPSRC + "disablechrome.html", false, run_chrome_about_test_5);
 }
+
+// Should hide the chrome
+function run_chrome_about_test_5() {
+  info("Chrome about: tests");
+  test_url("about:preferences", true, function(){
+    info("Tabs on bottom");
+    TabsOnTop.enabled = false;
+    run_http_test6();
+  });
+}
+
+function run_http_test6() {
+  info("HTTP tests");
+  test_url(HTTPSRC + "disablechrome.html", false, run_chrome_about_test_6);
+}
+
+function run_chrome_about_test_6() {
+  info("Chrome about: tests");
+  test_url("about:preferences", true, end_test);
+}