port bug 1729285

comm-central/patches/9999999-port1729285-suite-94a1.patch

@@ -0,0 +1,60 @@
+# HG changeset patch
+# User Bill Gianopoulos <wgianopoulos@gmail.com>
+# Date 1631100168 0
+Bug 9999999 - Port bug 1729285 to suite.
+Bug 1729285 - Observers used with NS_NewTimerWithObserver should implement nsINamed, r=smaug.
+
+diff --git a/suite/components/migration/src/nsSuiteProfileMigratorBase.cpp b/suite/components/migration/src/nsSuiteProfileMigratorBase.cpp
+--- a/suite/components/migration/src/nsSuiteProfileMigratorBase.cpp
++++ b/suite/components/migration/src/nsSuiteProfileMigratorBase.cpp
+@@ -38,16 +38,22 @@ using namespace mozilla;
+ // nsITimerCallback
+ 
+ NS_IMETHODIMP
+ nsSuiteProfileMigratorBase::Notify(nsITimer *timer) {
+   CopyNextFolder();
+   return NS_OK;
+ }
+ 
++NS_IMETHODIMP
++nsSuiteProfileMigratorBase::GetName(nsACString& aName) {
++  aName.AssignLiteral("nsSuiteProfileMigratorBase");
++  return NS_OK;
++}
++
+ ///////////////////////////////////////////////////////////////////////////////
+ // nsSuiteProfileMigratorBase
+ 
+ nsSuiteProfileMigratorBase::nsSuiteProfileMigratorBase() {
+   mFileCopyTransactionIndex = 0;
+   mObserverService = do_GetService("@mozilla.org/observer-service;1");
+ }
+ 
+diff --git a/suite/components/migration/src/nsSuiteProfileMigratorBase.h b/suite/components/migration/src/nsSuiteProfileMigratorBase.h
+--- a/suite/components/migration/src/nsSuiteProfileMigratorBase.h
++++ b/suite/components/migration/src/nsSuiteProfileMigratorBase.h
+@@ -32,21 +32,23 @@ struct fileTransactionEntry {
+ 
+ #define MAKEPREFTRANSFORM(pref, newpref, getmethod, setmethod) \
+   { pref, newpref, F(Get##getmethod), F(Set##setmethod), false, { -1 } }
+ 
+ #define MAKESAMETYPEPREFTRANSFORM(pref, method) \
+   { pref, 0, F(Get##method), F(Set##method), false, { -1 } }
+ 
+ class nsSuiteProfileMigratorBase : public nsISuiteProfileMigrator,
+-                                   public nsITimerCallback
++                                   public nsITimerCallback,
++                                   public nsINamed
+ {
+ public:
+   NS_DECL_ISUPPORTS
+   NS_DECL_NSITIMERCALLBACK
++  NS_DECL_NSINAMED
+ 
+   nsSuiteProfileMigratorBase();
+ 
+   struct PrefTransform;
+   typedef nsresult(*prefConverter)(PrefTransform*, nsIPrefBranch*);
+ 
+   struct PrefTransform {
+     const char*   sourcePrefName;

comm-central/patches/series

@@ -1,5 +1,6 @@
 9999999-port1712633-suite-90a1.patch
 9999999-port1646560-suite-91a1.patch
+9999999-port1729285-suite-94a1.patch
 TOP-1642188-remove-nsDOMIEvent-cc.patch
 TOP-1611010-DOMEventListener-cc.patch
 TOP-1614671-port1456035-4-and-5-61a1-cc.patch