Bug 1574475 - Stop compiling FTP code r=necko-reviewers,dragana

Differential Revision: https://phabricator.services.mozilla.com/D111245

Author: valenting

dom/webbrowserpersist/nsWebBrowserPersist.cpp

@@ -42,7 +42,6 @@
 #include "nsIThreadRetargetableRequest.h"
 #include "nsContentUtils.h"
 
-#include "ftpCore.h"
 #include "nsIStringBundle.h"
 #include "nsIProtocolHandler.h"
 

netwerk/build/components.conf

@@ -295,14 +295,6 @@ Classes = [
         'headers': ['mozilla/net/nsFileProtocolHandler.h'],
         'init_method': 'Init',
     },
-    {
-        'cid': '{25029490-f132-11d2-9588-00805f369f95}',
-        'contract_ids': ['@mozilla.org/network/protocol;1?name=ftp'],
-        'singleton': True,
-        'type': 'nsFtpProtocolHandler',
-        'headers': ['/netwerk/protocol/ftp/nsFtpProtocolHandler.h'],
-        'init_method': 'Init',
-    },
     {
         'cid': '{4f47e42e-4d23-4dd3-bfda-eb29255e9ea3}',
         'contract_ids': ['@mozilla.org/network/protocol;1?name=http'],

netwerk/build/moz.build

@@ -29,7 +29,6 @@ LOCAL_INCLUDES += [
     "/netwerk/protocol/about",
     "/netwerk/protocol/data",
     "/netwerk/protocol/file",
-    "/netwerk/protocol/ftp",
     "/netwerk/protocol/http",
     "/netwerk/protocol/res",
     "/netwerk/protocol/viewsource",

netwerk/ipc/NeckoChannelParams.ipdlh

@@ -6,7 +6,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 include protocol PHttpChannel;
-include protocol PFTPChannel;
 include protocol PChildToParentStream;
 include BlobTypes;
 include ClientIPCTypes;
@@ -387,31 +386,6 @@ struct ConsoleReportCollected {
   nsString[] stringParams;
 };
 
-//-----------------------------------------------------------------------------
-// FTP IPDL structs
-//-----------------------------------------------------------------------------
-
-struct FTPChannelOpenArgs
-{
-  URIParams                 uri;
-  uint64_t                  startPos;
-  nsCString                 entityID;
-  IPCStream?                uploadStream;
-  LoadInfoArgs?             loadInfo;
-  uint32_t                  loadFlags;
-};
-
-struct FTPChannelConnectArgs
-{
-  uint32_t channelId;
-};
-
-union FTPChannelCreationArgs
-{
-  FTPChannelOpenArgs;      // For AsyncOpen: the common case.
-  FTPChannelConnectArgs;   // Used for redirected-to channels
-};
-
 struct CookieStruct
 {
   nsCString name;

netwerk/ipc/NeckoChild.cpp

@@ -11,7 +11,6 @@
 #include "mozilla/dom/BrowserChild.h"
 #include "mozilla/net/HttpChannelChild.h"
 #include "mozilla/net/CookieServiceChild.h"
-#include "mozilla/net/FTPChannelChild.h"
 #include "mozilla/net/DataChannelChild.h"
 #ifdef MOZ_WIDGET_GTK
 #  include "mozilla/net/GIOChannelChild.h"
@@ -128,22 +127,6 @@ bool NeckoChild::DeallocPAltDataOutputStreamChild(
   return true;
 }
 
-PFTPChannelChild* NeckoChild::AllocPFTPChannelChild(
-    PBrowserChild* aBrowser, const SerializedLoadContext& aSerialized,
-    const FTPChannelCreationArgs& aOpenArgs) {
-  // We don't allocate here: see FTPChannelChild::AsyncOpen()
-  MOZ_CRASH("AllocPFTPChannelChild should not be called");
-  return nullptr;
-}
-
-bool NeckoChild::DeallocPFTPChannelChild(PFTPChannelChild* channel) {
-  MOZ_ASSERT(IsNeckoChild(), "DeallocPFTPChannelChild called by non-child!");
-
-  FTPChannelChild* child = static_cast<FTPChannelChild*>(channel);
-  child->ReleaseIPDLReference();
-  return true;
-}
-
 #ifdef MOZ_WIDGET_GTK
 PGIOChannelChild* NeckoChild::AllocPGIOChannelChild(
     PBrowserChild* aBrowser, const SerializedLoadContext& aSerialized,

netwerk/ipc/NeckoChild.h

@@ -38,10 +38,6 @@ class NeckoChild : public PNeckoChild {
 
   PCookieServiceChild* AllocPCookieServiceChild();
   bool DeallocPCookieServiceChild(PCookieServiceChild*);
-  PFTPChannelChild* AllocPFTPChannelChild(
-      PBrowserChild* aBrowser, const SerializedLoadContext& aSerialized,
-      const FTPChannelCreationArgs& aOpenArgs);
-  bool DeallocPFTPChannelChild(PFTPChannelChild*);
 #ifdef MOZ_WIDGET_GTK
   PGIOChannelChild* AllocPGIOChannelChild(
       PBrowserChild* aBrowser, const SerializedLoadContext& aSerialized,

netwerk/ipc/NeckoParent.cpp

@@ -14,7 +14,6 @@
 #include "mozilla/net/NeckoParent.h"
 #include "mozilla/net/HttpChannelParent.h"
 #include "mozilla/net/CookieServiceParent.h"
-#include "mozilla/net/FTPChannelParent.h"
 #include "mozilla/net/WebSocketChannelParent.h"
 #include "mozilla/net/WebSocketEventListenerParent.h"
 #include "mozilla/net/DataChannelParent.h"
@@ -126,16 +125,6 @@ static already_AddRefed<nsIPrincipal> GetRequestingPrincipal(
   return GetRequestingPrincipal(args.loadInfo());
 }
 
-static already_AddRefed<nsIPrincipal> GetRequestingPrincipal(
-    const FTPChannelCreationArgs& aArgs) {
-  if (aArgs.type() != FTPChannelCreationArgs::TFTPChannelOpenArgs) {
-    return nullptr;
-  }
-
-  const FTPChannelOpenArgs& args = aArgs.get_FTPChannelOpenArgs();
-  return GetRequestingPrincipal(args.loadInfo());
-}
-
 const char* NeckoParent::GetValidatedOriginAttributes(
     const SerializedLoadContext& aSerialized, PContentParent* aContent,
     nsIPrincipal* aRequestingPrincipal, OriginAttributes& aAttrs) {
@@ -278,47 +267,6 @@ bool NeckoParent::DeallocPAltDataOutputStreamParent(
   return true;
 }
 
-PFTPChannelParent* NeckoParent::AllocPFTPChannelParent(
-    PBrowserParent* aBrowser, const SerializedLoadContext& aSerialized,
-    const FTPChannelCreationArgs& aOpenArgs) {
-  nsCOMPtr<nsIPrincipal> requestingPrincipal =
-      GetRequestingPrincipal(aOpenArgs);
-
-  nsCOMPtr<nsILoadContext> loadContext;
-  const char* error = CreateChannelLoadContext(
-      aBrowser, Manager(), aSerialized, requestingPrincipal, loadContext);
-  if (error) {
-    printf_stderr(
-        "NeckoParent::AllocPFTPChannelParent: "
-        "FATAL error: %s: KILLING CHILD PROCESS\n",
-        error);
-    return nullptr;
-  }
-  PBOverrideStatus overrideStatus =
-      PBOverrideStatusFromLoadContext(aSerialized);
-  FTPChannelParent* p = new FTPChannelParent(BrowserParent::GetFrom(aBrowser),
-                                             loadContext, overrideStatus);
-  p->AddRef();
-  return p;
-}
-
-bool NeckoParent::DeallocPFTPChannelParent(PFTPChannelParent* channel) {
-  FTPChannelParent* p = static_cast<FTPChannelParent*>(channel);
-  p->Release();
-  return true;
-}
-
-mozilla::ipc::IPCResult NeckoParent::RecvPFTPChannelConstructor(
-    PFTPChannelParent* aActor, PBrowserParent* aBrowser,
-    const SerializedLoadContext& aSerialized,
-    const FTPChannelCreationArgs& aOpenArgs) {
-  FTPChannelParent* p = static_cast<FTPChannelParent*>(aActor);
-  if (!p->Init(aOpenArgs)) {
-    return IPC_FAIL_NO_REASON(this);
-  }
-  return IPC_OK();
-}
-
 already_AddRefed<PDocumentChannelParent>
 NeckoParent::AllocPDocumentChannelParent(
     const MaybeDiscarded<BrowsingContext>& aContext,

netwerk/ipc/NeckoParent.h

@@ -110,14 +110,6 @@ class NeckoParent : public PNeckoParent {
   bool DeallocPAltDataOutputStreamParent(PAltDataOutputStreamParent* aActor);
 
   bool DeallocPCookieServiceParent(PCookieServiceParent*);
-  PFTPChannelParent* AllocPFTPChannelParent(
-      PBrowserParent* aBrowser, const SerializedLoadContext& aSerialized,
-      const FTPChannelCreationArgs& aOpenArgs);
-  virtual mozilla::ipc::IPCResult RecvPFTPChannelConstructor(
-      PFTPChannelParent* aActor, PBrowserParent* aBrowser,
-      const SerializedLoadContext& aSerialized,
-      const FTPChannelCreationArgs& aOpenArgs) override;
-  bool DeallocPFTPChannelParent(PFTPChannelParent*);
   PWebSocketParent* AllocPWebSocketParent(
       PBrowserParent* browser, const SerializedLoadContext& aSerialized,
       const uint32_t& aSerial);

netwerk/ipc/PNecko.ipdl

@@ -9,7 +9,6 @@ include protocol PContent;
 include protocol PHttpChannel;
 include protocol PCookieService;
 include protocol PBrowser;
-include protocol PFTPChannel;
 #ifdef MOZ_WIDGET_GTK
 include protocol PGIOChannel;
 #endif
@@ -55,7 +54,6 @@ nested(upto inside_cpow) sync protocol PNecko
   manager PContent;
   manages PHttpChannel;
   manages PCookieService;
-  manages PFTPChannel;
   manages PWebSocket;
   manages PWebSocketEventListener;
   manages PTCPSocket;
@@ -82,8 +80,6 @@ parent:
   async PHttpChannel(nullable PBrowser browser,
                      SerializedLoadContext loadContext,
                      HttpChannelCreationArgs args);
-  async PFTPChannel(nullable PBrowser browser, SerializedLoadContext loadContext,
-                    FTPChannelCreationArgs args);
 
   async PWebSocket(nullable PBrowser browser, SerializedLoadContext loadContext,
                    uint32_t aSerialID);

netwerk/protocol/moz.build

@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ["about", "data", "file", "ftp"]
+DIRS += ["about", "data", "file"]
 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
     DIRS += ["gio"]
 DIRS += ["http", "res", "viewsource", "websocket"]