Bug 702300 (part 2) - Fix indentation in about:memory tests. r=jschoenick.
authorNicholas Nethercote <nnethercote@mozilla.com>
Thu, 16 Feb 2012 22:10:03 -0800
changeset 88772 49bae78a33a79c03928903a2d4c9db0dbec91191
parent 88771 a22548d04fc3cd10c339a39243a66060c554b08b
child 88773 397de2686f8890896a525d7e0f8e4cbb98ffe839
push id975
push userffxbld
push dateTue, 13 Mar 2012 21:39:16 +0000
treeherdermozilla-aurora@99faebf9dc36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjschoenick
bugs702300
milestone13.0a1
Bug 702300 (part 2) - Fix indentation in about:memory tests. r=jschoenick.
toolkit/components/aboutmemory/tests/test_aboutmemory.xul
--- a/toolkit/components/aboutmemory/tests/test_aboutmemory.xul
+++ b/toolkit/components/aboutmemory/tests/test_aboutmemory.xul
@@ -87,54 +87,54 @@
     f("", "explicit/b/c/b",     HEAP,      2 * MB), // omitted
     f("", "explicit/g/a",       HEAP,      6 * MB),
     f("", "explicit/g/b",       HEAP,      5 * MB),
     f("", "explicit/g/other",   HEAP,      4 * MB),
     f("", "other1",             OTHER,   111 * MB),
     f2("", "other4",            OTHER,   COUNT_CUMULATIVE, 888)
   ];
   let fakeMultiReporters = [
-     { name: "fake1",
-       collectReports: function(cbObj, closure) {
-          function f(p, k, u, a) { cbObj.callback("", p, k, u, a, "(desc)", closure); }
-          f("explicit/c/d",     NONHEAP, BYTES,  13 * MB),
-          f("explicit/c/d",     NONHEAP, BYTES,  10 * MB), // dup
-          f("explicit/c/other", NONHEAP, BYTES,  77 * MB),
-          f("explicit/cc",      NONHEAP, BYTES,  13 * MB);
-          f("explicit/cc",      NONHEAP, BYTES,  10 * MB); // dup
-          f("explicit/d",       NONHEAP, BYTES, 499 * KB); // omitted
-          f("explicit/e",       NONHEAP, BYTES, 100 * KB); // omitted
-          f("explicit/f/g/h/i", HEAP,    BYTES,  20 * MB);
-       },
-       explicitNonHeap: (100 + 13 + 10)*MB + (499 + 100)*KB
-     },
-     { name: "fake2",
-       collectReports: function(cbObj, closure) {
-          function f(p, k, u, a) { cbObj.callback("", p, k, u, a, "(desc)", closure); }
-          f("other3",           OTHER,   COUNT, 777);
-          f("other2",           OTHER,   BYTES, 222 * MB);
-          f("perc2",            OTHER,   PERCENTAGE, 10000);
-          f("perc1",            OTHER,   PERCENTAGE, 4567);
-       },
-       explicitNonHeap: 0
-     },
-     { name: "smaps",
-       collectReports: function(cbObj, closure) {
-          // The amounts are given in pages, so multiply here by 4kb.
-          function f(p, a) { cbObj.callback("", p, NONHEAP, BYTES, a * 4 * KB, "(desc)", closure); }
-          f("smaps/vsize/a",     24);
-          f("smaps/swap/a",       1);
-          f("smaps/swap/a",       2);
-          f("smaps/vsize/a",      19);
-          f("smaps/swap/b/c",     10);
-          f("smaps/resident/a",   42);
-          f("smaps/pss/a",        43);
-       },
-       explicitNonHeap: 0
-     }
+    { name: "fake1",
+      collectReports: function(cbObj, closure) {
+        function f(p, k, u, a) { cbObj.callback("", p, k, u, a, "(desc)", closure); }
+        f("explicit/c/d",     NONHEAP, BYTES,  13 * MB),
+        f("explicit/c/d",     NONHEAP, BYTES,  10 * MB), // dup
+        f("explicit/c/other", NONHEAP, BYTES,  77 * MB),
+        f("explicit/cc",      NONHEAP, BYTES,  13 * MB);
+        f("explicit/cc",      NONHEAP, BYTES,  10 * MB); // dup
+        f("explicit/d",       NONHEAP, BYTES, 499 * KB); // omitted
+        f("explicit/e",       NONHEAP, BYTES, 100 * KB); // omitted
+        f("explicit/f/g/h/i", HEAP,    BYTES,  20 * MB);
+      },
+      explicitNonHeap: (100 + 13 + 10)*MB + (499 + 100)*KB
+    },
+    { name: "fake2",
+      collectReports: function(cbObj, closure) {
+        function f(p, k, u, a) { cbObj.callback("", p, k, u, a, "(desc)", closure); }
+        f("other3",           OTHER,   COUNT, 777);
+        f("other2",           OTHER,   BYTES, 222 * MB);
+        f("perc2",            OTHER,   PERCENTAGE, 10000);
+        f("perc1",            OTHER,   PERCENTAGE, 4567);
+      },
+      explicitNonHeap: 0
+    },
+    { name: "smaps",
+      collectReports: function(cbObj, closure) {
+        // The amounts are given in pages, so multiply here by 4kb.
+        function f(p, a) { cbObj.callback("", p, NONHEAP, BYTES, a * 4 * KB, "(desc)", closure); }
+        f("smaps/vsize/a",     24);
+        f("smaps/swap/a",       1);
+        f("smaps/swap/a",       2);
+        f("smaps/vsize/a",      19);
+        f("smaps/swap/b/c",     10);
+        f("smaps/resident/a",   42);
+        f("smaps/pss/a",        43);
+      },
+      explicitNonHeap: 0
+    }
   ];
   for (let i = 0; i < fakeReporters.length; i++) {
     mgr.registerReporter(fakeReporters[i]);
   }
   for (let i = 0; i < fakeMultiReporters.length; i++) {
     mgr.registerMultiReporter(fakeMultiReporters[i]);
   }
 
@@ -201,28 +201,28 @@
     f("5th", "explicit/a/neg1",  NONHEAP, -20 * KB),
     f("5th", "explicit/a/neg2",  NONHEAP, -10 * KB),
     f("5th", "explicit/b/c/d/e", NONHEAP,  20 * KB),
     f("5th", "explicit/b/c/d/f", NONHEAP, -60 * KB),
     f("5th", "explicit/b/c/g/h", NONHEAP,  10 * KB),
     f("5th", "explicit/b/c/i/j", NONHEAP,   5 * KB)
   ];
   let fakeMultiReporters2 = [
-     // Because this multi-reporter is in a child process, the fact that we
-     // skip the "smaps" multi-reporter in the parent process won't cause
-     // these to be skipped;  the fall-back skipping will be hit instead.
-     { name: "smaps",
-       collectReports: function(cbObj, closure) {
-          // The amounts are given in pages, so multiply here by 4kb.
-          function f(p, a) { cbObj.callback("2nd", p, NONHEAP, BYTES, a * 4 * KB, "(desc)", closure); }
-          f("smaps/vsize/a",     24);
-          f("smaps/vsize/b",     24);
-       },
-       explicitNonHeap: 0
-     }
+    // Because this multi-reporter is in a child process, the fact that we
+    // skip the "smaps" multi-reporter in the parent process won't cause
+    // these to be skipped;  the fall-back skipping will be hit instead.
+    { name: "smaps",
+      collectReports: function(cbObj, closure) {
+        // The amounts are given in pages, so multiply here by 4kb.
+        function f(p, a) { cbObj.callback("2nd", p, NONHEAP, BYTES, a * 4 * KB, "(desc)", closure); }
+        f("smaps/vsize/a",     24);
+        f("smaps/vsize/b",     24);
+      },
+      explicitNonHeap: 0
+    }
   ];
   for (let i = 0; i < fakeReporters2.length; i++) {
     mgr.registerReporter(fakeReporters2[i]);
   }
   for (let i = 0; i < fakeMultiReporters2.length; i++) {
     mgr.registerMultiReporter(fakeMultiReporters2[i]);
   }
   fakeReporters = fakeReporters.concat(fakeReporters2);