Bug 1426526 - Remove references to the old Chromium temporary file prefix. r=gsvelto,florian
authorJed Davis <jld@mozilla.com>
Wed, 14 Aug 2019 22:48:43 +0000
changeset 488052 87737e44c8b7537b159dfa0422ee599f85caf2c3
parent 488051 f936472f7576d515b673a4e42811a7daf0f3214d
child 488053 86cb672b7000844c4802bc890e7b759e42e0e722
push id36434
push usercbrindusan@mozilla.com
push dateThu, 15 Aug 2019 09:44:30 +0000
treeherdermozilla-central@144fbfb409b7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgsvelto, florian
bugs1426526
milestone70.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1426526 - Remove references to the old Chromium temporary file prefix. r=gsvelto,florian With the removal of the old Chromium file_util code, we should no longer be using temporary files with names starting with "org.chromium.", so the crash reporter and main thread I/O test no longer need to recognize that prefix. Differential Revision: https://phabricator.services.mozilla.com/D34629
browser/base/content/test/performance/browser_startup_content_mainthreadio.js
browser/base/content/test/performance/browser_startup_mainthreadio.js
toolkit/crashreporter/breakpad-client/linux/minidump_writer/linux_dumper.cc
--- a/browser/base/content/test/performance/browser_startup_content_mainthreadio.js
+++ b/browser/base/content/test/performance/browser_startup_content_mainthreadio.js
@@ -354,20 +354,17 @@ add_task(async function() {
       if (LINUX && filename.startsWith("/dev/shm/")) {
         continue;
       }
 
       // Shared memory uses temporary files on MacOS <= 10.11 to avoid
       // a kernel security bug that will never be patched (see
       // https://crbug.com/project-zero/1671 for details).  This can
       // be removed when we no longer support those OS versions.
-      //
-      // The org.chromium prefix will be removed in bug 1426526.
-      if (MAC && (filename.startsWith(tmpPath + "/org.chromium.") ||
-                  filename.startsWith(tmpPath + "/org.mozilla.ipc."))) {
+      if (MAC && filename.startsWith(tmpPath + "/org.mozilla.ipc.")) {
         continue;
       }
 
       let expected = false;
       for (let entry of whitelist) {
         if (pathMatches(entry.path, filename)) {
           entry[marker.operation] = (entry[marker.operation] || 0) - 1;
           entry._used = true;
--- a/browser/base/content/test/performance/browser_startup_mainthreadio.js
+++ b/browser/base/content/test/performance/browser_startup_mainthreadio.js
@@ -928,20 +928,17 @@ add_task(async function() {
       if (LINUX && filename.startsWith("/dev/shm/")) {
         continue;
       }
 
       // Shared memory uses temporary files on MacOS <= 10.11 to avoid
       // a kernel security bug that will never be patched (see
       // https://crbug.com/project-zero/1671 for details).  This can
       // be removed when we no longer support those OS versions.
-      //
-      // The org.chromium prefix will be removed in bug 1426526.
-      if (MAC && (filename.startsWith(tmpPath + "/org.chromium.") ||
-                  filename.startsWith(tmpPath + "/org.mozilla.ipc."))) {
+      if (MAC && filename.startsWith(tmpPath + "/org.mozilla.ipc.")) {
         continue;
       }
 
       let expected = false;
       for (let entry of whitelist) {
         if (pathMatches(entry.path, filename)) {
           entry[marker.operation] = (entry[marker.operation] || 0) - 1;
           entry._used = true;
--- a/toolkit/crashreporter/breakpad-client/linux/minidump_writer/linux_dumper.cc
+++ b/toolkit/crashreporter/breakpad-client/linux/minidump_writer/linux_dumper.cc
@@ -68,17 +68,16 @@ static const int DT_ANDROID_RELA = DT_LO
 #endif
 
 #endif  // __ANDROID __
 
 static const char kMappedFileUnsafePrefix[] = "/dev/";
 static const char kDeletedSuffix[] = " (deleted)";
 static const char kReservedFlags[] = " ---p";
 static const char kMozillaIpcPrefix[] = "org.mozilla.ipc.";
-static const char kChromiumPrefix[] = "org.chromium.";
 
 inline static bool IsMappedFileOpenUnsafe(
     const google_breakpad::MappingInfo& mapping) {
   // It is unsafe to attempt to open a mapped file that lives under /dev,
   // because the semantics of the open may be driver-specific so we'd risk
   // hanging the crash dumper. And a file in /dev/ almost certainly has no
   // ELF file identifier anyways.
   return my_strncmp(mapping.name,
@@ -570,18 +569,17 @@ bool LinuxDumper::ReadAuxv() {
       res = true;
     }
   }
   sys_close(fd);
   return res;
 }
 
 bool LinuxDumper::IsIPCSharedMemorySegment(const char* name) {
-  if ((my_strstr(name, kMozillaIpcPrefix) ||
-       my_strstr(name, kChromiumPrefix)) &&
+  if (my_strstr(name, kMozillaIpcPrefix) &&
       my_strstr(name, kDeletedSuffix)) {
     return true;
   }
 
   return false;
 }
 
 bool LinuxDumper::EnumerateMappings() {