Back out Bug 589025.

dom/ipc/PBrowser.ipdl

@@ -121,9 +121,7 @@ parent:
 
     __delete__();
 
-    PExternalHelperApp(URI uri, nsCString aMimeContentType,
-                       nsCString aContentDisposition, bool aForceSave,
-                       PRInt64 aContentLength);
+    PExternalHelperApp(URI uri, nsCString aMimeContentType, bool aForceSave, PRInt64 aContentLength);
 
 child:
     CreateWidget(MagicWindowHandle parentWidget);

dom/ipc/TabChild.cpp

@@ -1243,7 +1243,6 @@ TabChildGlobal::GetPrincipal()
 PExternalHelperAppChild*
 TabChild::AllocPExternalHelperApp(const IPC::URI& uri,
                                   const nsCString& aMimeContentType,
-                                  const nsCString& aContentDisposition,
                                   const bool& aForceSave,
                                   const PRInt64& aContentLength)
 {

dom/ipc/TabChild.h

@@ -227,7 +227,6 @@ public:
     virtual PExternalHelperAppChild *AllocPExternalHelperApp(
             const IPC::URI& uri,
             const nsCString& aMimeContentType,
-            const nsCString& aContentDisposition,
             const bool& aForceSave,
             const PRInt64& aContentLength);
     virtual bool DeallocPExternalHelperApp(PExternalHelperAppChild *aService);

dom/ipc/TabParent.cpp

@@ -811,13 +811,12 @@ TabParent::GetFrameLoader() const
 PExternalHelperAppParent*
 TabParent::AllocPExternalHelperApp(const IPC::URI& uri,
                                    const nsCString& aMimeContentType,
-                                   const nsCString& aContentDisposition,
                                    const bool& aForceSave,
                                    const PRInt64& aContentLength)
 {
   ExternalHelperAppParent *parent = new ExternalHelperAppParent(uri, aContentLength);
   parent->AddRef();
-  parent->Init(this, aMimeContentType, aContentDisposition, aForceSave);
+  parent->Init(this, aMimeContentType, aForceSave);
   return parent;
 }
 

dom/ipc/TabParent.h

@@ -150,7 +150,6 @@ public:
     virtual PExternalHelperAppParent* AllocPExternalHelperApp(
             const IPC::URI& uri,
             const nsCString& aMimeContentType,
-            const nsCString& aContentDisposition,
             const bool& aForceSave,
             const PRInt64& aContentLength);
     virtual bool DeallocPExternalHelperApp(PExternalHelperAppParent* aService);

uriloader/exthandler/ExternalHelperAppParent.cpp

@@ -69,7 +69,6 @@ ExternalHelperAppParent::ExternalHelperAppParent(
 void
 ExternalHelperAppParent::Init(TabParent *parent,
                               const nsCString& aMimeContentType,
-                              const nsCString& aContentDisposition,
                               const PRBool& aForceSave)
 {
   nsHashPropertyBag::Init();
@@ -83,7 +82,6 @@ ExternalHelperAppParent::Init(TabParent *parent,
     do_GetService(NS_EXTERNALHELPERAPPSERVICE_CONTRACTID);
   NS_ASSERTION(helperAppService, "No Helper App Service!");
 
-  mContentDisposition = aContentDisposition;
   helperAppService->DoContent(aMimeContentType, this, ir,
                               aForceSave, getter_AddRefs(mListener));
 }
@@ -300,7 +298,7 @@ ExternalHelperAppParent::SetContentCharset(const nsACString& aContentCharset)
 NS_IMETHODIMP
 ExternalHelperAppParent::GetContentDisposition(nsACString& aContentDisposition)
 {
-  aContentDisposition = mContentDisposition;
+  aContentDisposition.Truncate();
   return NS_OK;
 }
 

uriloader/exthandler/ExternalHelperAppParent.h

@@ -69,7 +69,6 @@ public:
     ExternalHelperAppParent(const IPC::URI& uri, const PRInt64& contentLength);
     void Init(TabParent *parent,
               const nsCString& aMimeContentType,
-              const nsCString& aContentDisposition,
               const PRBool& aForceSave);
     virtual ~ExternalHelperAppParent();
 
@@ -80,7 +79,6 @@ private:
   nsLoadFlags mLoadFlags;
   nsresult mStatus;
   PRInt64 mContentLength;
-  nsCString mContentDisposition;
   nsCString mEntityID;
 };
 

uriloader/exthandler/nsExternalHelperAppService.cpp

@@ -653,12 +653,8 @@ NS_IMETHODIMP nsExternalHelperAppService::DoContent(const nsACString& aMimeConte
       return NS_ERROR_FAILURE;
 
     PRInt64 contentLength = -1;
-    nsCString disp;
-    if (channel) {
+    if (channel)
       channel->GetContentLength(&contentLength);
-      channel->GetContentDisposition(disp);
-    }
-
 
     // Now we build a protocol for forwarding our data to the parent.  The
     // protocol will act as a listener on the child-side and create a "real"
@@ -669,7 +665,7 @@ NS_IMETHODIMP nsExternalHelperAppService::DoContent(const nsACString& aMimeConte
     TabChild *child = static_cast<TabChild*>(tabchild.get());
     mozilla::dom::PExternalHelperAppChild *pc;
     pc = child->SendPExternalHelperAppConstructor(IPC::URI(uri),
-                                                  nsCString(aMimeContentType), disp,
+                                                  nsCString(aMimeContentType),
                                                   aForceSave, contentLength);
     ExternalHelperAppChild *childListener = static_cast<ExternalHelperAppChild *>(pc);