Bug 1439883 - Port Bug 1435671: NS_MutateURI::Apply() is no longer templated (take 2). r=aceman

ldap/xpcom/src/nsLDAPURL.cpp

@@ -38,10 +38,10 @@ nsLDAPURL::Init(uint32_t aUrlType, int32_t aDefaultPort,
 {
   nsresult rv;
   rv = NS_MutateURI(NS_STANDARDURLMUTATOR_CONTRACTID)
-         .Apply<nsIStandardURLMutator>(&nsIStandardURLMutator::Init,
-                                       nsIStandardURL::URLTYPE_STANDARD,
-                                       aDefaultPort, PromiseFlatCString(aSpec),
-                                       aOriginCharset, aBaseURI, nullptr)
+         .Apply(NS_MutatorMethod(&nsIStandardURLMutator::Init,
+                                 nsIStandardURL::URLTYPE_STANDARD,
+                                 aDefaultPort, PromiseFlatCString(aSpec),
+                                 aOriginCharset, aBaseURI, nullptr))
          .Finalize(mBaseURL);
   NS_ENSURE_SUCCESS(rv, rv);
 

mailnews/compose/src/nsMsgSend.cpp

@@ -2057,8 +2057,8 @@ nsMsgComposeAndSend::AddCompFieldLocalAttachments()
               nsCOMPtr<nsIURL> fileUrl;
               rv = NS_MutateURI(NS_STANDARDURLMUTATOR_CONTRACTID)
                      .Apply(NS_MutatorMethod(&nsIURLMutator::SetFileName,
-                                           m_attachments[newLoc]->m_realName,
-                                           nullptr))
+                                             m_attachments[newLoc]->m_realName,
+                                             nullptr))
                      .Finalize(fileUrl);
               if (NS_SUCCEEDED(rv))
               {