rebase

comm-central/patches/TOP-1614671-port1456035-4-and-5-61a1-cc.patch

@@ -730,28 +730,6 @@ diff --git a/suite/components/migration/SuiteProfileMigrator.js b/suite/componen
  };
  
  var NSGetFactory = XPCOMUtils.generateNSGetFactory([ProfileMigrator]);
-diff --git a/suite/components/nsAbout.js b/suite/components/nsAbout.js
---- a/suite/components/nsAbout.js
-+++ b/suite/components/nsAbout.js
-@@ -30,17 +30,17 @@ About.prototype = {
-   rightsFlags: SCRIPT | UNTRUSTED,
-   rightsURI: "chrome://branding/content/aboutRights.xhtml",
-   sessionrestoreFlags: SCRIPT | HIDE,
-   sessionrestoreURI: "chrome://communicator/content/aboutSessionRestore.xhtml",
-   // synctabsFlags: SCRIPT,
-   // synctabsURI: "chrome://communicator/content/aboutSyncTabs.xul",
- 
-   classID: Components.ID("{d54f2c89-8fd6-4eeb-a7a4-51d4dcdf460f}"),
--  QueryInterface: XPCOMUtils.generateQI([Ci.nsIAboutModule]),
-+  QueryInterface: ChromeUtils.generateQI([Ci.nsIAboutModule]),
- 
-   getModule: function(aURI) {
-     return aURI.pathQueryRef.replace(/-|\W.*$/g, "").toLowerCase();
-   },
- 
-   getURIFlags: function(aURI) {
-     return this[this.getModule(aURI) + "Flags"];
-   },
 diff --git a/suite/components/nsGopherProtocolStubHandler.js b/suite/components/nsGopherProtocolStubHandler.js
 --- a/suite/components/nsGopherProtocolStubHandler.js
 +++ b/suite/components/nsGopherProtocolStubHandler.js