Bug 1347178 - Port bug 1344629 to mailnews. Rewrite unnecessary uses of nsLiteralString. r=jorgk CLOSED TREE

ldap/xpcom/src/nsLDAPService.cpp

@@ -568,7 +568,7 @@ nsLDAPService::OnLDAPMessage(nsILDAPMessage *aMessage)
         // log the message
         //
         rv = consoleSvc->LogStringMessage(
-            NS_LITERAL_STRING("LDAP: WARNING: nsLDAPService::OnLDAPMessage(): Unexpected LDAP message received").get());
+            u"LDAP: WARNING: nsLDAPService::OnLDAPMessage(): Unexpected LDAP message received");
         NS_ASSERTION(NS_SUCCEEDED(rv), "nsLDAPService::OnLDAPMessage(): "
                      "consoleSvc->LogStringMessage() failed");
         break;

mailnews/addrbook/src/nsAbMDBDirectory.cpp

@@ -83,7 +83,7 @@ NS_IMETHODIMP nsAbMDBDirectory::Init(const char *aUri)
     NS_ENSURE_SUCCESS(rv, rv);
 
     nsCOMPtr<nsIPrefBranch> prefBranch;
-    rv = prefService->GetBranch(NS_LITERAL_CSTRING(PREF_LDAP_SERVER_TREE_NAME ".").get(),
+    rv = prefService->GetBranch(PREF_LDAP_SERVER_TREE_NAME ".",
                                 getter_AddRefs(prefBranch));
     NS_ENSURE_SUCCESS(rv, rv);
 

mailnews/base/src/nsMessengerWinIntegration.cpp

@@ -53,7 +53,7 @@
 #define PROFILE_COMMANDLINE_ARG " -profile "
 
 #define NOTIFICATIONCLASSNAME "MailBiffNotificationMessageWindow"
-#define UNREADMAILNODEKEY "Software\\Microsoft\\Windows\\CurrentVersion\\UnreadMail\\"
+#define UNREADMAILNODEKEY u"Software\\Microsoft\\Windows\\CurrentVersion\\UnreadMail\\"
 #define DOUBLE_QUOTE "\""
 #define MAIL_COMMANDLINE_ARG " -mail"
 #define IDI_MAILBIFF 32576
@@ -961,7 +961,7 @@ nsMessengerWinIntegration::RemoveCurrentFromRegistry()
   {
     if (wcscmp(registryUnreadMailCountKey, currentUnreadMailCountKey.get())==0) {
       nsAutoString deleteKey;
-      deleteKey.Assign(NS_LITERAL_STRING(UNREADMAILNODEKEY).get());
+      deleteKey.Assign(UNREADMAILNODEKEY);
       deleteKey.Append(currentUnreadMailCountKey.get());
 
       if (!deleteKey.IsEmpty()) {