Bug 1212510 Bustage fix: Rename NS_ParseContentType to NS_ParseResponseContentType (caused by Bug 1210302), r=jcranmer, a=rkent
authorPhilip Chee <philip.chee@gmail.com>
Wed, 07 Oct 2015 16:30:10 -0700
changeset 18493 5d74f3155ba28dc1606e81ea3db8e9521753d217
parent 18492 8ff37e14f523d3054d04f516342ce8c79322aa50
child 18494 4bcf10412c0ff59fdae2b2d77dc9232020ee48db
push id11315
push userkent@caspia.com
push dateWed, 07 Oct 2015 23:30:43 +0000
treeherdercomm-central@5d74f3155ba2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjcranmer, rkent
bugs1212510, 1210302
Bug 1212510 Bustage fix: Rename NS_ParseContentType to NS_ParseResponseContentType (caused by Bug 1210302), r=jcranmer, a=rkent
mailnews/base/util/nsMsgProtocol.cpp
mailnews/imap/src/nsImapProtocol.cpp
mailnews/news/src/nsNntpMockChannel.cpp
--- a/mailnews/base/util/nsMsgProtocol.cpp
+++ b/mailnews/base/util/nsMsgProtocol.cpp
@@ -576,17 +576,17 @@ NS_IMETHODIMP nsMsgProtocol::GetContentT
   else
     aContentType = m_ContentType;
   return NS_OK;
 }
 
 NS_IMETHODIMP nsMsgProtocol::SetContentType(const nsACString &aContentType)
 {
   nsAutoCString charset;
-  nsresult rv = NS_ParseContentType(aContentType, m_ContentType, charset);
+  nsresult rv = NS_ParseResponseContentType(aContentType, m_ContentType, charset);
   if (NS_FAILED(rv) || m_ContentType.IsEmpty())
     m_ContentType.AssignLiteral(UNKNOWN_CONTENT_TYPE);
   return rv;
 }
 
 NS_IMETHODIMP nsMsgProtocol::GetContentCharset(nsACString &aContentCharset)
 {
   aContentCharset.Truncate();
--- a/mailnews/imap/src/nsImapProtocol.cpp
+++ b/mailnews/imap/src/nsImapProtocol.cpp
@@ -9481,17 +9481,17 @@ NS_IMETHODIMP nsImapMockChannel::GetCont
   else
     aContentType = m_ContentType;
   return NS_OK;
 }
 
 NS_IMETHODIMP nsImapMockChannel::SetContentType(const nsACString &aContentType)
 {
   nsAutoCString charset;
-  nsresult rv = NS_ParseContentType(aContentType, m_ContentType, charset);
+  nsresult rv = NS_ParseResponseContentType(aContentType, m_ContentType, charset);
   if (NS_FAILED(rv) || m_ContentType.IsEmpty())
     m_ContentType.AssignLiteral(UNKNOWN_CONTENT_TYPE);
   return rv;
 }
 
 NS_IMETHODIMP nsImapMockChannel::GetContentCharset(nsACString &aContentCharset)
 {
   aContentCharset.Truncate();
--- a/mailnews/news/src/nsNntpMockChannel.cpp
+++ b/mailnews/news/src/nsNntpMockChannel.cpp
@@ -197,17 +197,17 @@ NS_IMETHODIMP nsNntpMockChannel::GetCont
   FORWARD_CALL(GetContentType, aContentType)
   aContentType = m_contentType;
   return NS_OK;
 }
 
 NS_IMETHODIMP nsNntpMockChannel::SetContentType(const nsACString &aContentType)
 {
   FORWARD_CALL(SetContentType, aContentType)
-  return NS_ParseContentType(aContentType, m_contentType, m_contentCharset);
+  return NS_ParseResponseContentType(aContentType, m_contentType, m_contentCharset);
 }
 
 NS_IMETHODIMP nsNntpMockChannel::GetContentCharset(nsACString &aCharset)
 {
   FORWARD_CALL(GetContentCharset, aCharset)
   aCharset = m_contentCharset;
   return NS_OK;
 }