Backed out changeset 65048ac4ae6f (bug 939385) for perma failures/orange in XPCShell Tests on Linux and OS X on a CLOSED TREE

toolkit/components/aboutmemory/tests/test_aboutmemory5.xul

@@ -104,8 +104,7 @@
         // If we have more than 1000 chars, we've probably successfully
         // copy+pasted.
         if (actual.length > 1000) {
-          // Note: Match "vsize" but not "vsize-max-contiguous".
-          let vsizes = actual.match(/vsize[^-]/g);
+          let vsizes = actual.match(/vsize/g);
           let endOfBrowsers  = actual.match(/End of Browser/g);
 
           if (vsizes.length == 4 && endOfBrowsers.length == 3) {

xpcom/base/nsMemoryReporterManager.cpp

@@ -399,20 +399,6 @@ static nsresult GetVsizeMaxContiguous(int64_t* aN)
     return NS_OK;
 }
 
-class VsizeMaxContiguousReporter MOZ_FINAL : public MemoryUniReporter
-{
-public:
-    VsizeMaxContiguousReporter()
-      : MemoryUniReporter("vsize-max-contiguous", KIND_OTHER, UNITS_BYTES,
-"Size of the maximum contiguous block of available virtual memory.")
-    {}
-
-    NS_IMETHOD GetAmount(int64_t* aAmount)
-    {
-        return GetVsizeMaxContiguous(aAmount);
-    }
-};
-
 #define HAVE_PRIVATE_REPORTER
 class PrivateReporter MOZ_FINAL : public MemoryUniReporter
 {
@@ -790,10 +776,6 @@ nsMemoryReporterManager::Init()
     RegisterReporter(new ResidentReporter);
 #endif
 
-#ifdef HAVE_VSIZE_MAX_CONTIGUOUS_REPORTER
-    RegisterReporter(new VsizeMaxContiguousReporter);
-#endif
-
 #ifdef HAVE_RESIDENT_UNIQUE_REPORTER
     RegisterReporter(new ResidentUniqueReporter);
 #endif