From b3c48a110484c91086ad347ba235c048e5cd0b72 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan.akhgari@gmail.com>
Date: Mon, 1 May 2017 15:43:39 -0400
Subject: [PATCH] Bug 1360723 follow-up: Rename
 ContentParent::AboutToLoadDocumentForChild to
 ContentParent::AboutToLoadHttpFtpWyciwygDocumentForChild

---
 dom/ipc/ContentParent.cpp                         | 2 +-
 dom/ipc/ContentParent.h                           | 2 +-
 netwerk/protocol/ftp/FTPChannelParent.cpp         | 2 +-
 netwerk/protocol/http/HttpChannelParent.cpp       | 2 +-
 netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
index da60b7519380..f247938df100 100644
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -5055,7 +5055,7 @@ ContentParent::ForceTabPaint(TabParent* aTabParent, uint64_t aLayerObserverEpoch
 }
 
 nsresult
-ContentParent::AboutToLoadDocumentForChild(nsIChannel* aChannel)
+ContentParent::AboutToLoadHttpFtpWyciwygDocumentForChild(nsIChannel* aChannel)
 {
   MOZ_ASSERT(aChannel);
 
diff --git a/dom/ipc/ContentParent.h b/dom/ipc/ContentParent.h
index fdd1c49942ba..167bbab2e48e 100644
--- a/dom/ipc/ContentParent.h
+++ b/dom/ipc/ContentParent.h
@@ -656,7 +656,7 @@ public:
   // HTTP(S), FTP or wyciwyg channel for a content process.  It is a useful
   // place to start to kick off work as early as possible in response to such
   // document loads.
-  nsresult AboutToLoadDocumentForChild(nsIChannel* aChannel);
+  nsresult AboutToLoadHttpFtpWyciwygDocumentForChild(nsIChannel* aChannel);
 
   nsresult TransmitPermissionsForPrincipal(nsIPrincipal* aPrincipal);
 
diff --git a/netwerk/protocol/ftp/FTPChannelParent.cpp b/netwerk/protocol/ftp/FTPChannelParent.cpp
index 6f0eb5382a71..cf3577bb1501 100644
--- a/netwerk/protocol/ftp/FTPChannelParent.cpp
+++ b/netwerk/protocol/ftp/FTPChannelParent.cpp
@@ -462,7 +462,7 @@ FTPChannelParent::OnStartRequest(nsIRequest* aRequest, nsISupports* aContext)
   // performing a document load.
   PContentParent* pcp = Manager()->Manager();
   DebugOnly<nsresult> rv =
-    static_cast<ContentParent*>(pcp)->AboutToLoadDocumentForChild(chan);
+    static_cast<ContentParent*>(pcp)->AboutToLoadHttpFtpWyciwygDocumentForChild(chan);
   MOZ_ASSERT(NS_SUCCEEDED(rv));
 
   int64_t contentLength;
diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp
index be73d38388c6..a4297e7123f4 100644
--- a/netwerk/protocol/http/HttpChannelParent.cpp
+++ b/netwerk/protocol/http/HttpChannelParent.cpp
@@ -1148,7 +1148,7 @@ HttpChannelParent::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext)
     PContentParent* pcp = Manager()->Manager();
     MOZ_ASSERT(pcp, "We should have a manager if our IPC isn't closed");
     DebugOnly<nsresult> rv =
-      static_cast<ContentParent*>(pcp)->AboutToLoadDocumentForChild(chan);
+      static_cast<ContentParent*>(pcp)->AboutToLoadHttpFtpWyciwygDocumentForChild(chan);
     MOZ_ASSERT(NS_SUCCEEDED(rv));
   }
 
diff --git a/netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp b/netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp
index 7edf39e79b30..2d6b3084b344 100644
--- a/netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp
+++ b/netwerk/protocol/wyciwyg/WyciwygChannelParent.cpp
@@ -326,7 +326,7 @@ WyciwygChannelParent::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext
   // Send down any permissions which are relevant to this URL if we are
   // performing a document load.
   PContentParent* pcp = Manager()->Manager();
-  rv = static_cast<ContentParent*>(pcp)->AboutToLoadDocumentForChild(chan);
+  rv = static_cast<ContentParent*>(pcp)->AboutToLoadHttpFtpWyciwygDocumentForChild(chan);
   MOZ_ASSERT(NS_SUCCEEDED(rv));
 
   nsresult status;