move embedding/components to docshell/components
MozReview-Commit-ID: Db7IT5Izg45
rename from embedding/components/appstartup/moz.build
rename to docshell/components/appstartup/moz.build
rename from embedding/components/appstartup/nsAppStartupNotifier.cpp
rename to docshell/components/appstartup/nsAppStartupNotifier.cpp
rename from embedding/components/appstartup/nsAppStartupNotifier.h
rename to docshell/components/appstartup/nsAppStartupNotifier.h
rename from embedding/components/appstartup/nsIAppStartupNotifier.h
rename to docshell/components/appstartup/nsIAppStartupNotifier.h
rename from embedding/components/build/moz.build
rename to docshell/components/build/moz.build
rename from embedding/components/build/nsEmbeddingModule.cpp
rename to docshell/components/build/nsEmbeddingModule.cpp
rename from embedding/components/commandhandler/moz.build
rename to docshell/components/commandhandler/moz.build
rename from embedding/components/commandhandler/nsBaseCommandController.cpp
rename to docshell/components/commandhandler/nsBaseCommandController.cpp
rename from embedding/components/commandhandler/nsBaseCommandController.h
rename to docshell/components/commandhandler/nsBaseCommandController.h
rename from embedding/components/commandhandler/nsCommandGroup.cpp
rename to docshell/components/commandhandler/nsCommandGroup.cpp
rename from embedding/components/commandhandler/nsCommandGroup.h
rename to docshell/components/commandhandler/nsCommandGroup.h
rename from embedding/components/commandhandler/nsCommandManager.cpp
rename to docshell/components/commandhandler/nsCommandManager.cpp
rename from embedding/components/commandhandler/nsCommandManager.h
rename to docshell/components/commandhandler/nsCommandManager.h
rename from embedding/components/commandhandler/nsCommandParams.cpp
rename to docshell/components/commandhandler/nsCommandParams.cpp
rename from embedding/components/commandhandler/nsCommandParams.h
rename to docshell/components/commandhandler/nsCommandParams.h
rename from embedding/components/commandhandler/nsControllerCommandTable.cpp
rename to docshell/components/commandhandler/nsControllerCommandTable.cpp
rename from embedding/components/commandhandler/nsControllerCommandTable.h
rename to docshell/components/commandhandler/nsControllerCommandTable.h
rename from embedding/components/commandhandler/nsICommandManager.idl
rename to docshell/components/commandhandler/nsICommandManager.idl
rename from embedding/components/commandhandler/nsICommandParams.idl
rename to docshell/components/commandhandler/nsICommandParams.idl
rename from embedding/components/commandhandler/nsIControllerCommand.idl
rename to docshell/components/commandhandler/nsIControllerCommand.idl
rename from embedding/components/commandhandler/nsIControllerCommandTable.idl
rename to docshell/components/commandhandler/nsIControllerCommandTable.idl
rename from embedding/components/commandhandler/nsIControllerContext.idl
rename to docshell/components/commandhandler/nsIControllerContext.idl
rename from embedding/components/commandhandler/nsPICommandUpdater.idl
rename to docshell/components/commandhandler/nsPICommandUpdater.idl
rename from embedding/components/find/moz.build
rename to docshell/components/find/moz.build
rename from embedding/components/find/nsFind.cpp
rename to docshell/components/find/nsFind.cpp
rename from embedding/components/find/nsFind.h
rename to docshell/components/find/nsFind.h
rename from embedding/components/find/nsIFind.idl
rename to docshell/components/find/nsIFind.idl
rename from embedding/components/find/nsIWebBrowserFind.idl
rename to docshell/components/find/nsIWebBrowserFind.idl
rename from embedding/components/find/nsWebBrowserFind.cpp
rename to docshell/components/find/nsWebBrowserFind.cpp
rename from embedding/components/find/nsWebBrowserFind.h
rename to docshell/components/find/nsWebBrowserFind.h
rename from embedding/components/moz.build
rename to docshell/components/moz.build
rename from embedding/components/printingui/ipc/PPrintProgressDialog.ipdl
rename to docshell/components/printingui/ipc/PPrintProgressDialog.ipdl
rename from embedding/components/printingui/ipc/PPrintSettingsDialog.ipdl
rename to docshell/components/printingui/ipc/PPrintSettingsDialog.ipdl
rename from embedding/components/printingui/ipc/PPrinting.ipdl
rename to docshell/components/printingui/ipc/PPrinting.ipdl
rename from embedding/components/printingui/ipc/PPrintingTypes.ipdlh
rename to docshell/components/printingui/ipc/PPrintingTypes.ipdlh
rename from embedding/components/printingui/ipc/PrintDataUtils.cpp
rename to docshell/components/printingui/ipc/PrintDataUtils.cpp
rename from embedding/components/printingui/ipc/PrintDataUtils.h
rename to docshell/components/printingui/ipc/PrintDataUtils.h
rename from embedding/components/printingui/ipc/PrintProgressDialogChild.cpp
rename to docshell/components/printingui/ipc/PrintProgressDialogChild.cpp
rename from embedding/components/printingui/ipc/PrintProgressDialogChild.h
rename to docshell/components/printingui/ipc/PrintProgressDialogChild.h
rename from embedding/components/printingui/ipc/PrintProgressDialogParent.cpp
rename to docshell/components/printingui/ipc/PrintProgressDialogParent.cpp
rename from embedding/components/printingui/ipc/PrintProgressDialogParent.h
rename to docshell/components/printingui/ipc/PrintProgressDialogParent.h
rename from embedding/components/printingui/ipc/PrintSettingsDialogChild.cpp
rename to docshell/components/printingui/ipc/PrintSettingsDialogChild.cpp
rename from embedding/components/printingui/ipc/PrintSettingsDialogChild.h
rename to docshell/components/printingui/ipc/PrintSettingsDialogChild.h
rename from embedding/components/printingui/ipc/PrintSettingsDialogParent.cpp
rename to docshell/components/printingui/ipc/PrintSettingsDialogParent.cpp
rename from embedding/components/printingui/ipc/PrintSettingsDialogParent.h
rename to docshell/components/printingui/ipc/PrintSettingsDialogParent.h
rename from embedding/components/printingui/ipc/PrintingParent.cpp
rename to docshell/components/printingui/ipc/PrintingParent.cpp
rename from embedding/components/printingui/ipc/PrintingParent.h
rename to docshell/components/printingui/ipc/PrintingParent.h
rename from embedding/components/printingui/ipc/moz.build
rename to docshell/components/printingui/ipc/moz.build
rename from embedding/components/printingui/ipc/nsPrintingProxy.cpp
rename to docshell/components/printingui/ipc/nsPrintingProxy.cpp
rename from embedding/components/printingui/ipc/nsPrintingProxy.h
rename to docshell/components/printingui/ipc/nsPrintingProxy.h
rename from embedding/components/printingui/mac/moz.build
rename to docshell/components/printingui/mac/moz.build
rename from embedding/components/printingui/mac/nsPrintProgress.cpp
rename to docshell/components/printingui/mac/nsPrintProgress.cpp
rename from embedding/components/printingui/mac/nsPrintProgress.h
rename to docshell/components/printingui/mac/nsPrintProgress.h
rename from embedding/components/printingui/mac/nsPrintProgressParams.cpp
rename to docshell/components/printingui/mac/nsPrintProgressParams.cpp
rename from embedding/components/printingui/mac/nsPrintProgressParams.h
rename to docshell/components/printingui/mac/nsPrintProgressParams.h
rename from embedding/components/printingui/mac/nsPrintingPromptService.h
rename to docshell/components/printingui/mac/nsPrintingPromptService.h
rename from embedding/components/printingui/mac/nsPrintingPromptServiceX.mm
rename to docshell/components/printingui/mac/nsPrintingPromptServiceX.mm
rename from embedding/components/printingui/moz.build
rename to docshell/components/printingui/moz.build
rename from embedding/components/printingui/unixshared/moz.build
rename to docshell/components/printingui/unixshared/moz.build
rename from embedding/components/printingui/unixshared/nsPrintProgress.cpp
rename to docshell/components/printingui/unixshared/nsPrintProgress.cpp
rename from embedding/components/printingui/unixshared/nsPrintProgress.h
rename to docshell/components/printingui/unixshared/nsPrintProgress.h
rename from embedding/components/printingui/unixshared/nsPrintProgressParams.cpp
rename to docshell/components/printingui/unixshared/nsPrintProgressParams.cpp
rename from embedding/components/printingui/unixshared/nsPrintProgressParams.h
rename to docshell/components/printingui/unixshared/nsPrintProgressParams.h
rename from embedding/components/printingui/unixshared/nsPrintingPromptService.cpp
rename to docshell/components/printingui/unixshared/nsPrintingPromptService.cpp
rename from embedding/components/printingui/unixshared/nsPrintingPromptService.h
rename to docshell/components/printingui/unixshared/nsPrintingPromptService.h
rename from embedding/components/printingui/win/moz.build
rename to docshell/components/printingui/win/moz.build
rename from embedding/components/printingui/win/nsPrintDialogUtil.cpp
rename to docshell/components/printingui/win/nsPrintDialogUtil.cpp
rename from embedding/components/printingui/win/nsPrintDialogUtil.h
rename to docshell/components/printingui/win/nsPrintDialogUtil.h
rename from embedding/components/printingui/win/nsPrintProgress.cpp
rename to docshell/components/printingui/win/nsPrintProgress.cpp
rename from embedding/components/printingui/win/nsPrintProgress.h
rename to docshell/components/printingui/win/nsPrintProgress.h
rename from embedding/components/printingui/win/nsPrintProgressParams.cpp
rename to docshell/components/printingui/win/nsPrintProgressParams.cpp
rename from embedding/components/printingui/win/nsPrintProgressParams.h
rename to docshell/components/printingui/win/nsPrintProgressParams.h
rename from embedding/components/printingui/win/nsPrintingPromptService.cpp
rename to docshell/components/printingui/win/nsPrintingPromptService.cpp
rename from embedding/components/printingui/win/nsPrintingPromptService.h
rename to docshell/components/printingui/win/nsPrintingPromptService.h
rename from embedding/components/webbrowserpersist/PWebBrowserPersistDocument.ipdl
rename to docshell/components/webbrowserpersist/PWebBrowserPersistDocument.ipdl
rename from embedding/components/webbrowserpersist/PWebBrowserPersistResources.ipdl
rename to docshell/components/webbrowserpersist/PWebBrowserPersistResources.ipdl
rename from embedding/components/webbrowserpersist/PWebBrowserPersistSerialize.ipdl
rename to docshell/components/webbrowserpersist/PWebBrowserPersistSerialize.ipdl
rename from embedding/components/webbrowserpersist/WebBrowserPersistDocumentChild.cpp
rename to docshell/components/webbrowserpersist/WebBrowserPersistDocumentChild.cpp
rename from embedding/components/webbrowserpersist/WebBrowserPersistDocumentChild.h
rename to docshell/components/webbrowserpersist/WebBrowserPersistDocumentChild.h
rename from embedding/components/webbrowserpersist/WebBrowserPersistDocumentParent.cpp
rename to docshell/components/webbrowserpersist/WebBrowserPersistDocumentParent.cpp
rename from embedding/components/webbrowserpersist/WebBrowserPersistDocumentParent.h
rename to docshell/components/webbrowserpersist/WebBrowserPersistDocumentParent.h
rename from embedding/components/webbrowserpersist/WebBrowserPersistLocalDocument.cpp
rename to docshell/components/webbrowserpersist/WebBrowserPersistLocalDocument.cpp
rename from embedding/components/webbrowserpersist/WebBrowserPersistLocalDocument.h
rename to docshell/components/webbrowserpersist/WebBrowserPersistLocalDocument.h
rename from embedding/components/webbrowserpersist/WebBrowserPersistRemoteDocument.cpp
rename to docshell/components/webbrowserpersist/WebBrowserPersistRemoteDocument.cpp
rename from embedding/components/webbrowserpersist/WebBrowserPersistRemoteDocument.h
rename to docshell/components/webbrowserpersist/WebBrowserPersistRemoteDocument.h
rename from embedding/components/webbrowserpersist/WebBrowserPersistResourcesChild.cpp
rename to docshell/components/webbrowserpersist/WebBrowserPersistResourcesChild.cpp
rename from embedding/components/webbrowserpersist/WebBrowserPersistResourcesChild.h
rename to docshell/components/webbrowserpersist/WebBrowserPersistResourcesChild.h
rename from embedding/components/webbrowserpersist/WebBrowserPersistResourcesParent.cpp
rename to docshell/components/webbrowserpersist/WebBrowserPersistResourcesParent.cpp
rename from embedding/components/webbrowserpersist/WebBrowserPersistResourcesParent.h
rename to docshell/components/webbrowserpersist/WebBrowserPersistResourcesParent.h
rename from embedding/components/webbrowserpersist/WebBrowserPersistSerializeChild.cpp
rename to docshell/components/webbrowserpersist/WebBrowserPersistSerializeChild.cpp
rename from embedding/components/webbrowserpersist/WebBrowserPersistSerializeChild.h
rename to docshell/components/webbrowserpersist/WebBrowserPersistSerializeChild.h
rename from embedding/components/webbrowserpersist/WebBrowserPersistSerializeParent.cpp
rename to docshell/components/webbrowserpersist/WebBrowserPersistSerializeParent.cpp
rename from embedding/components/webbrowserpersist/WebBrowserPersistSerializeParent.h
rename to docshell/components/webbrowserpersist/WebBrowserPersistSerializeParent.h
rename from embedding/components/webbrowserpersist/moz.build
rename to docshell/components/webbrowserpersist/moz.build
rename from embedding/components/webbrowserpersist/nsCWebBrowserPersist.idl
rename to docshell/components/webbrowserpersist/nsCWebBrowserPersist.idl
rename from embedding/components/webbrowserpersist/nsIWebBrowserPersist.idl
rename to docshell/components/webbrowserpersist/nsIWebBrowserPersist.idl
rename from embedding/components/webbrowserpersist/nsIWebBrowserPersistDocument.idl
rename to docshell/components/webbrowserpersist/nsIWebBrowserPersistDocument.idl
rename from embedding/components/webbrowserpersist/nsIWebBrowserPersistable.idl
rename to docshell/components/webbrowserpersist/nsIWebBrowserPersistable.idl
rename from embedding/components/webbrowserpersist/nsWebBrowserPersist.cpp
rename to docshell/components/webbrowserpersist/nsWebBrowserPersist.cpp
rename from embedding/components/webbrowserpersist/nsWebBrowserPersist.h
rename to docshell/components/webbrowserpersist/nsWebBrowserPersist.h
rename from embedding/components/windowwatcher/moz.build
rename to docshell/components/windowwatcher/moz.build
rename from embedding/components/windowwatcher/nsAutoWindowStateHelper.cpp
rename to docshell/components/windowwatcher/nsAutoWindowStateHelper.cpp
rename from embedding/components/windowwatcher/nsAutoWindowStateHelper.h
rename to docshell/components/windowwatcher/nsAutoWindowStateHelper.h
rename from embedding/components/windowwatcher/nsDialogParamBlock.cpp
rename to docshell/components/windowwatcher/nsDialogParamBlock.cpp
rename from embedding/components/windowwatcher/nsDialogParamBlock.h
rename to docshell/components/windowwatcher/nsDialogParamBlock.h
rename from embedding/components/windowwatcher/nsIDialogParamBlock.idl
rename to docshell/components/windowwatcher/nsIDialogParamBlock.idl
rename from embedding/components/windowwatcher/nsIPromptFactory.idl
rename to docshell/components/windowwatcher/nsIPromptFactory.idl
rename from embedding/components/windowwatcher/nsIPromptService.idl
rename to docshell/components/windowwatcher/nsIPromptService.idl
rename from embedding/components/windowwatcher/nsIPromptService2.idl
rename to docshell/components/windowwatcher/nsIPromptService2.idl
rename from embedding/components/windowwatcher/nsIWindowWatcher.idl
rename to docshell/components/windowwatcher/nsIWindowWatcher.idl
rename from embedding/components/windowwatcher/nsPIPromptService.idl
rename to docshell/components/windowwatcher/nsPIPromptService.idl
rename from embedding/components/windowwatcher/nsPIWindowWatcher.idl
rename to docshell/components/windowwatcher/nsPIWindowWatcher.idl
rename from embedding/components/windowwatcher/nsPromptUtils.h
rename to docshell/components/windowwatcher/nsPromptUtils.h
rename from embedding/components/windowwatcher/nsWindowWatcher.cpp
rename to docshell/components/windowwatcher/nsWindowWatcher.cpp
rename from embedding/components/windowwatcher/nsWindowWatcher.h
rename to docshell/components/windowwatcher/nsWindowWatcher.h
rename from embedding/components/windowwatcher/test/browser.ini
rename to docshell/components/windowwatcher/test/browser.ini
rename from embedding/components/windowwatcher/test/browser_new_content_window_chromeflags.js
rename to docshell/components/windowwatcher/test/browser_new_content_window_chromeflags.js
rename from embedding/components/windowwatcher/test/browser_new_content_window_from_chrome_principal.js
rename to docshell/components/windowwatcher/test/browser_new_content_window_from_chrome_principal.js
rename from embedding/components/windowwatcher/test/browser_new_remote_window_flags.js
rename to docshell/components/windowwatcher/test/browser_new_remote_window_flags.js
rename from embedding/components/windowwatcher/test/browser_new_sized_window.js
rename to docshell/components/windowwatcher/test/browser_new_sized_window.js
rename from embedding/components/windowwatcher/test/chrome.ini
rename to docshell/components/windowwatcher/test/chrome.ini
rename from embedding/components/windowwatcher/test/file_storage_copied.html
rename to docshell/components/windowwatcher/test/file_storage_copied.html
rename from embedding/components/windowwatcher/test/file_test_dialog.html
rename to docshell/components/windowwatcher/test/file_test_dialog.html
rename from embedding/components/windowwatcher/test/mochitest.ini
rename to docshell/components/windowwatcher/test/mochitest.ini
rename from embedding/components/windowwatcher/test/moz.build
rename to docshell/components/windowwatcher/test/moz.build
rename from embedding/components/windowwatcher/test/test_blank_named_window.html
rename to docshell/components/windowwatcher/test/test_blank_named_window.html
rename from embedding/components/windowwatcher/test/test_dialog_arguments.html
rename to docshell/components/windowwatcher/test/test_dialog_arguments.html
rename from embedding/components/windowwatcher/test/test_modal_windows.html
rename to docshell/components/windowwatcher/test/test_modal_windows.html
rename from embedding/components/windowwatcher/test/test_named_window.html
rename to docshell/components/windowwatcher/test/test_named_window.html
rename from embedding/components/windowwatcher/test/test_storage_copied.html
rename to docshell/components/windowwatcher/test/test_storage_copied.html
--- a/docshell/moz.build
+++ b/docshell/moz.build
@@ -1,16 +1,17 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# 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 += [
'base',
+ 'components',
'shistory',
'build',
'resources/content',
]
XPCSHELL_TESTS_MANIFESTS += [
'test/unit/xpcshell.ini',
'test/unit_ipc/xpcshell.ini',
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -119,30 +119,30 @@ if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_
USE_LIBS += [
'mozsandbox',
]
LOCAL_INCLUDES += [
'/caps',
'/chrome',
'/docshell/base',
+ '/docshell/components/printingui/ipc',
'/dom/base',
'/dom/bluetooth/common',
'/dom/bluetooth/ipc',
'/dom/devicestorage',
'/dom/events',
'/dom/filesystem',
'/dom/fmradio/ipc',
'/dom/geolocation',
'/dom/media/webspeech/synth/ipc',
'/dom/mobilemessage/ipc',
'/dom/security',
'/dom/storage',
'/dom/workers',
- '/embedding/components/printingui/ipc',
'/extensions/cookie',
'/extensions/spellcheck/src',
'/gfx/2d',
'/hal/sandbox',
'/layout/base',
'/media/webrtc',
'/netwerk/base',
'/toolkit/xre',
--- a/embedding/browser/nsIPrintingPrompt.idl
+++ b/embedding/browser/nsIPrintingPrompt.idl
@@ -48,17 +48,17 @@ interface nsIPrintingPrompt : nsISupport
* Stated once again: There is no "fallback" native platform support in GFX for the
* displaying of the native print dialog. The current default implementation for Windows
* display a native print dialog but a XUL-based progress dialog.
* If you wish to have a native progress dialog on Windows you will have to create and
* register your own service.
*
* Note: The Windows version Mozilla implements this service which is
* automatically built and registered for you. You can use it as an example.
- * It is located at "mozilla/embedding/components/printingui/win". That service
+ * It is located at "mozilla/docshell/components/printingui/win". That service
* is capable of displaying a native print dialog and a XUL progress dialog.
*
* To fly your own dialog you may:
*
* 1) Implement this service to display at least the Print Dialog and a Print Progress Dialog
* or you may implement just one of the dialogs and pass back NS_ERROR_NOT_IMPLEMENTED
* for any of the others.
*
--- a/embedding/browser/nsIPrintingPromptService.idl
+++ b/embedding/browser/nsIPrintingPromptService.idl
@@ -44,17 +44,17 @@ interface nsIPrintingPromptService : nsI
* Stated once again: There is no "fallback" native platform support in GFX for the
* displaying of the native print dialog. The current default implementation for Windows
* display a native print dialog but a XUL-based progress dialog.
* If you wish to have a native progress dialog on Windows you will have to create and
* register your own service.
*
* Note: The Windows version Mozilla implements this service which is
* automatically built and registered for you. You can use it as an example.
- * It is located at "mozilla/embedding/components/printingui/win". That service
+ * It is located at "mozilla/docshell/components/printingui/win". That service
* is capable of displaying a native print dialog and a XUL progress dialog.
*
* To fly your own dialog you may:
*
* 1) Implement this service to display at least the Print Dialog and a Print Progress Dialog
* or you may implement just one of the dialogs and pass back NS_ERROR_NOT_IMPLEMENTED
* for any of the others.
*
--- a/embedding/moz.build
+++ b/embedding/moz.build
@@ -1,15 +1,15 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# 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 += ['components', 'browser']
+DIRS += ['browser']
TEST_DIRS += ['test']
if CONFIG['ENABLE_TESTS']:
XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
XPIDL_SOURCES += [
'nsIWindowCreator.idl',
--- a/mobile/android/components/PromptService.js
+++ b/mobile/android/components/PromptService.js
@@ -667,17 +667,17 @@ var PromptUtils = {
propBag.setProperty("timePasswordChanged", now);
}
propBag.setProperty("timeLastUsed", now);
propBag.setProperty("timesUsedIncrement", 1);
this.pwmgr.modifyLogin(aLogin, propBag);
},
- // JS port of http://mxr.mozilla.org/mozilla-central/source/embedding/components/windowwatcher/nsPrompt.cpp#388
+ // JS port of http://mxr.mozilla.org/mozilla-central/source/docshell/components/windowwatcher/nsPrompt.cpp#388
makeDialogText: function pu_makeDialogText(aChannel, aAuthInfo) {
let isProxy = (aAuthInfo.flags & Ci.nsIAuthInformation.AUTH_PROXY);
let isPassOnly = (aAuthInfo.flags & Ci.nsIAuthInformation.ONLY_PASSWORD);
let isCrossOrig = (aAuthInfo.flags &
Ci.nsIAuthInformation.CROSS_ORIGIN_SUB_RESOURCE);
let username = aAuthInfo.username;
let [displayHost, realm] = this.getAuthTarget(aChannel, aAuthInfo);
@@ -704,17 +704,17 @@ var PromptUtils = {
text = this.bundle.formatStringFromName("EnterUserPasswordFor2", [displayHost], 1);
} else {
text = this.bundle.formatStringFromName("EnterLoginForRealm3", [realm, displayHost], 2);
}
return text;
},
- // JS port of http://mxr.mozilla.org/mozilla-central/source/embedding/components/windowwatcher/nsPromptUtils.h#89
+ // JS port of http://mxr.mozilla.org/mozilla-central/source/docshell/components/windowwatcher/nsPromptUtils.h#89
getAuthHostPort: function pu_getAuthHostPort(aChannel, aAuthInfo) {
let uri = aChannel.URI;
let res = { host: null, port: -1 };
if (aAuthInfo.flags & aAuthInfo.AUTH_PROXY) {
let proxy = aChannel.QueryInterface(Ci.nsIProxiedChannel);
res.host = proxy.proxyInfo.host;
res.port = proxy.proxyInfo.port;
} else {