From f4e82c94ed8bdd50b2f5a9d220ccef4dbab8ef37 Mon Sep 17 00:00:00 2001
From: "bzbarsky%mit.edu"
 <bzbarsky%mit.edu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 18 Mar 2005 04:16:02 +0000
Subject: [PATCH] Don't show username/password in the URI we print.  Bug
 186695, r=jst, sr=darin

git-svn-id: svn://10.0.0.236/trunk@170875 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/printing/nsPrintEngine.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/mozilla/layout/printing/nsPrintEngine.cpp b/mozilla/layout/printing/nsPrintEngine.cpp
index c466211cffc..f94edefd2c5 100644
--- a/mozilla/layout/printing/nsPrintEngine.cpp
+++ b/mozilla/layout/printing/nsPrintEngine.cpp
@@ -169,6 +169,9 @@ static const char kPrintingPromptService[] = "@mozilla.org/embedcomp/printingpro
 #include "nsPIDOMWindow.h"
 #include "nsIFocusController.h"
 
+#include "nsCDefaultURIFixup.h"
+#include "nsIURIFixup.h"
+
 //-----------------------------------------------------
 // PR LOGGING
 #ifdef MOZ_LOGGING
@@ -1822,9 +1825,17 @@ nsPrintEngine::GetDocumentTitleAndURL(nsIDocument* aDoc,
   nsIURI* url = aDoc->GetDocumentURI();
   if (!url) return;
 
+  nsCOMPtr<nsIURIFixup> urifixup(do_GetService(NS_URIFIXUP_CONTRACTID));
+  if (!urifixup) return;
+
+  nsCOMPtr<nsIURI> exposableURI;
+  urifixup->CreateExposableURI(url, getter_AddRefs(exposableURI));
+
+  if (!exposableURI) return;
+
   nsCAutoString urlCStr;
-  url->GetSpec(urlCStr);
-  *aURLStr = ToNewUnicode(NS_ConvertUTF8toUCS2(urlCStr));
+  exposableURI->GetSpec(urlCStr);
+  *aURLStr = UTF8ToNewUnicode(urlCStr);
 }
 
 //---------------------------------------------------------------------