Moving debug cache prefs to debug|networking pane (84805). r/sr=ben, a=asa

suite/common/pref/pref-debug.xul

@@ -34,8 +34,8 @@
   <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["nglayoutDebugWindow",
-                       "debugXULBoxes", "nglayoutDebugUseXBLForms", "nglayoutDebugDisableXULCache", "browserEnableCache",
-                       "browserEnableDiskCache", "nglayoutDebugEnableXPCOMRefcntLog", "showAboutAsStupidModalWindow",
+                       "debugXULBoxes", "nglayoutDebugUseXBLForms", 
+                       "nglayoutDebugEnableXPCOMRefcntLog", "showAboutAsStupidModalWindow",
                        "browserEnableTBDnD"];
   ]]>
   </script>
@@ -59,15 +59,6 @@
     <checkbox id="nglayoutDebugUseXBLForms" label="Use XBL-based form controls (takes effect after restart). Don't file bugs on these controls; they are still under construction."
               pref="true" preftype="bool" prefstring="nglayout.debug.enable_xbl_forms"
               prefattribute="checked"/>
-    <checkbox id="nglayoutDebugDisableXULCache" label="&debugDisableXULCache.label;"
-              pref="true" preftype="bool" prefstring="nglayout.debug.disable_xul_cache"
-              prefattribute="checked"/>
-    <checkbox id="browserEnableDiskCache" label="&debugEnableDiskCache.label;"
-              pref="true" preftype="bool" prefstring="browser.cache.disk.enable"
-              prefattribute="checked"/>
-    <checkbox id="browserEnableCache" label="&debugEnableMemCache.label;"
-              pref="true" preftype="bool" prefstring="browser.enable.cache"
-              prefattribute="checked"/>
     <checkbox id="browserEnableTBDnD" label="&debugEnableTBDnD.label;"
               pref="true" preftype="bool" prefstring="browser.enable.tb_dnd"
               prefattribute="checked"/>

suite/common/pref/pref-debug2.xul

@@ -34,7 +34,8 @@
   <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["browserEnableKeepAlive", "browserEnablePipelining",
-                       "dirGenerateHtml", "httpVersionString", "acceptEncodingString"];
+                       "dirGenerateHtml", "httpVersionString", "acceptEncodingString",
+                       "nglayoutDebugDisableXULCache", "browserEnableCache", "browserEnableDiskCache", ];
   ]]>
   </script>
         
@@ -66,5 +67,21 @@
               prefattribute="value"/> 
   </titledbox>
 
+  <titledbox orient="vertical">
+    <label value="&debugCache.label;"/>
+    <vbox autostretch="never">
+    <checkbox id="nglayoutDebugDisableXULCache" label="&debugDisableXULCache.label;"
+              pref="true" preftype="bool" prefstring="nglayout.debug.disable_xul_cache"
+              prefattribute="checked"/>
+    <checkbox id="browserEnableDiskCache" label="&debugEnableDiskCache.label;"
+              pref="true" preftype="bool" prefstring="browser.cache.disk.enable"
+              prefattribute="checked"/>
+    <checkbox id="browserEnableCache" label="&debugEnableMemCache.label;"
+              pref="true" preftype="bool" prefstring="browser.enable.cache"
+              prefattribute="checked"/>
+
+    </vbox>
+  </titledbox>
+
 </window>
 

suite/locales/en-US/chrome/common/pref/pref-debug.dtd

@@ -7,17 +7,14 @@
 
 <!-- Miscelleneous -->
 <!ENTITY debugMiscellaneous.label   "Miscellaneous">
-<!ENTITY debugDisableXULCache.label "Disable XUL Cache">
-<!ENTITY debugEnableMemCache.label "Enable Mem Cache">
-<!ENTITY debugEnableDiskCache.label "Enable Disk Cache">
 <!ENTITY debugEnableXPCOMRefcntLog.label "Enable XPCOM Refcount Log">
 <!ENTITY debugShowAboutAsStupidModalWindow.label "Show 'About' as modal dialog">
-
-<!-- Debug: Turn on gfx-rendered widgets -->
-<!ENTITY widgetRendering.label "Rendering">
-<!ENTITY gfxScrollbars.label "gfx scrollbars">
-<!ENTITY debugWindow.label "debug window">
-<!ENTITY debugXULBox.label "debug XUL boxes">
 <!ENTITY debugEnableTBDnD.label "Personal Toolbar Drag &amp; Drop (buggy)">
 
 
+<!-- Debug: Turn on gfx-rendered widgets -->
+<!ENTITY widgetRendering.label "Rendering">
+<!ENTITY debugWindow.label "debug window">
+<!ENTITY debugXULBox.label "debug XUL boxes">
+
+

suite/locales/en-US/chrome/common/pref/pref-debug2.dtd

@@ -13,4 +13,8 @@
 <!ENTITY acceptEncoding.label         "Accept-Encoding">
 <!ENTITY httpVersion.label            "HTTP Version">
 
-
+<!-- Cache -->
+<!ENTITY debugCache.label             "Cache">
+<!ENTITY debugDisableXULCache.label   "Disable XUL Cache">
+<!ENTITY debugEnableMemCache.label    "Enable Mem Cache">
+<!ENTITY debugEnableDiskCache.label   "Enable Disk Cache">