Backout b1bafd9591ab (bug 791457) due to the corresponding patch being backed out of m-c.
authorRyan VanderMeulen <ryanvm@gmail.com>
Mon, 17 Sep 2012 20:27:25 -0400
changeset 13664 3fa8e609454aededad618210eba55d9c0ccd086b
parent 13663 1f950704f3916d07b02d48599b8bdc3086bfeab2
child 13665 c7cb323988b1b6aaf20062f2dade447374ac11be
push id762
push userbugzilla@standard8.plus.com
push dateMon, 19 Nov 2012 21:16:42 +0000
treeherdercomm-beta@4a2f61509b17 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs791457
backs outb1bafd9591aba3073135fec154af73db621d6b21
Backout b1bafd9591ab (bug 791457) due to the corresponding patch being backed out of m-c. CLOSED TREE
calendar/installer/windows/packages-static
mail/installer/package-manifest.in
mail/installer/removed-files.in
mailnews/base/util/nsMsgProtocol.cpp
mailnews/base/util/nsMsgUtils.cpp
suite/installer/package-manifest.in
suite/installer/removed-files.in
--- a/calendar/installer/windows/packages-static
+++ b/calendar/installer/windows/packages-static
@@ -211,16 +211,17 @@ bin\components\nsDefaultCLH.js
 bin\components\nsDownloadManagerUI.js
 bin\components\nsExtensionManager.js
 bin\components\nsHandlerService.js
 bin\components\nsHelperAppDlg.js
 bin\components\nsLoginInfo.js
 bin\components\nsLoginManager.js
 bin\components\nsLoginManagerPrompter.js
 bin\components\nsProgressDialog.js
+bin\components\nsProxyAutoConfig.js
 bin\components\nsTryToClose.js
 #ifdef MOZ_UPDATER
 bin\components\nsUpdateService.js
 bin\components\nsUpdateServiceStub.js
 #endif
 bin\components\nsUpdateTimerManager.js
 bin\components\nsURLFormatter.js
 bin\components\nsWebHandlerApp.js
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -569,16 +569,18 @@
 @BINPATH@/components/necko_ftp.xpt
 @BINPATH@/components/necko_cache.xpt
 @BINPATH@/components/necko_cookie.xpt
 @BINPATH@/components/necko_socket.xpt
 @BINPATH@/components/necko_viewsource.xpt
 @BINPATH@/components/necko_websocket.xpt
 @BINPATH@/components/necko_wifi.xpt
 @BINPATH@/components/necko_wyciwyg.xpt
+@BINPATH@/components/nsProxyAutoConfig.js
+@BINPATH@/components/nsProxyAutoConfig.manifest
 
 ; extensions
 @BINPATH@/components/addonManager.js
 @BINPATH@/components/amContentHandler.js
 @BINPATH@/components/amWebInstallListener.js
 @BINPATH@/components/nsBlocklistService.js
 #ifdef MOZ_UPDATER
 @BINPATH@/components/nsUpdateService.js
--- a/mail/installer/removed-files.in
+++ b/mail/installer/removed-files.in
@@ -63,18 +63,16 @@ components/nsDownloadProgressListener.js
 components/nsDropbox.js
 components/nsExtensionManager.js
 components/nsInterfaceInfoToIDL.js
 components/nsLDAPPrefsService.js
 #ifdef XP_WIN
   components/nsPostUpdateWin.js
 #endif
 components/nsProgressDialog.js
-components/nsProxyAutoConfig.js
-components/nsProxyAutoConfig.manifest
 components/nsScriptableIO.js
 #ifdef XP_MACOSX
   components/nsSpotlightIntegration.js
 #endif
 components/nsUnsetDefaultMail.js
 #ifndef MOZ_UPDATER
   components/nsUpdateService.js
   components/nsUpdateServiceStub.js
@@ -464,16 +462,17 @@ regxpcom.exe
   components/nsMailNewsCommandLineHandler.js
   components/nsMicrosummaryService.js
   components/nsMsgTraitService.js
   components/nsPhishingProtectionApplication.js
   components/nsPlacesAutoComplete.js
   components/nsPlacesDBFlush.js
   components/nsPlacesExpiration.js
   components/nsPrompter.js
+  components/nsProxyAutoConfig.js
   components/nsSMTPProtocolHandler.js
   components/nsSetDefaultMail.js
   components/nsTaggingService.js
   components/nsTryToClose.js
   components/nsURLFormatter.js
   components/nsUpdateService.js
   components/nsUpdateServiceStub.js
   components/nsUpdateTimerManager.js
--- a/mailnews/base/util/nsMsgProtocol.cpp
+++ b/mailnews/base/util/nsMsgProtocol.cpp
@@ -19,17 +19,17 @@
 #include "nsIMsgWindow.h"
 #include "nsIMsgStatusFeedback.h"
 #include "nsIWebProgressListener.h"
 #include "nsIPipe.h"
 #include "nsIPrompt.h"
 #include "prprf.h"
 #include "plbase64.h"
 #include "nsIStringBundle.h"
-#include "nsIProtocolProxyService2.h"
+#include "nsIProtocolProxyService.h"
 #include "nsIProxyInfo.h"
 #include "nsThreadUtils.h"
 #include "nsIPrefBranch.h"
 #include "nsIPrefService.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsMsgUtils.h"
 #include "nsILineInputStream.h"
 #include "nsIMsgIncomingServer.h"
@@ -176,17 +176,17 @@ nsMsgProtocol::OpenNetworkSocket(nsIURI 
   nsAutoCString hostName;
   int32_t port = 0;
 
   aURL->GetPort(&port);
   aURL->GetAsciiHost(hostName);
 
   nsCOMPtr<nsIProxyInfo> proxyInfo;
 
-  nsCOMPtr<nsIProtocolProxyService2> pps =
+  nsCOMPtr<nsIProtocolProxyService> pps =
       do_GetService("@mozilla.org/network/protocol-proxy-service;1");
 
   NS_ASSERTION(pps, "Couldn't get the protocol proxy service!");
 
   if (pps)
   {
       nsresult rv = NS_OK;
 
@@ -213,17 +213,17 @@ nsMsgProtocol::OpenNetworkSocket(nsIURI 
               rv = proxyUri->SetScheme(NS_LITERAL_CSTRING("mailto"));
       }
       //
       // XXX(darin): Consider using AsyncResolve instead to avoid blocking
       //             the calling thread in cases where PAC may call into
       //             our DNS resolver.
       //
       if (NS_SUCCEEDED(rv))
-          rv = pps->DeprecatedBlockingResolve(proxyUri, 0, getter_AddRefs(proxyInfo));
+          rv = pps->Resolve(proxyUri, 0, getter_AddRefs(proxyInfo));
       NS_ASSERTION(NS_SUCCEEDED(rv), "Couldn't successfully resolve a proxy");
       if (NS_FAILED(rv)) proxyInfo = nullptr;
   }
 
   return OpenNetworkSocketWithInfo(hostName.get(), port, connectionType,
                                    proxyInfo, callbacks);
 }
 
--- a/mailnews/base/util/nsMsgUtils.cpp
+++ b/mailnews/base/util/nsMsgUtils.cpp
@@ -42,17 +42,16 @@
 #include "nsIRssIncomingServer.h"
 #include "nsIMsgFolder.h"
 #include "nsIMsgMessageService.h"
 #include "nsIMsgAccountManager.h"
 #include "nsIOutputStream.h"
 #include "nsMsgFileStream.h"
 #include "nsIFileURL.h"
 #include "nsNetUtil.h"
-#include "nsIProtocolProxyService2.h"
 #include "nsIMsgDatabase.h"
 #include "nsIMutableArray.h"
 #include "nsIMsgMailNewsUrl.h"
 #include "nsArrayUtils.h"
 #include "nsIStringBundle.h"
 #include "nsIMsgWindow.h"
 #include "nsIWindowWatcher.h"
 #include "nsIPrompt.h"
@@ -2032,17 +2031,17 @@ bool MsgAdvanceToNextLine(const char *bu
   return result;
 }
 
 NS_MSG_BASE nsresult
 MsgExamineForProxy(const char *scheme, const char *host,
                    int32_t port, nsIProxyInfo **proxyInfo)
 {
   nsresult rv;
-  nsCOMPtr<nsIProtocolProxyService2> pps =
+  nsCOMPtr<nsIProtocolProxyService> pps =
           do_GetService(NS_PROTOCOLPROXYSERVICE_CONTRACTID, &rv);
   if (NS_SUCCEEDED(rv)) {
     nsAutoCString spec(scheme);
     spec.Append("://");
     spec.Append(host);
     spec.Append(':');
     spec.AppendInt(port);
     // XXXXX - Under no circumstances whatsoever should any code which
@@ -2050,17 +2049,17 @@ MsgExamineForProxy(const char *scheme, c
     // actually want a uri (the dummy uris created here may not be 
     // syntactically valid for the specific protocol), and all we need
     // is something which has a valid scheme, hostname, and a string
     // to pass to PAC if needed - bbaetz
     nsCOMPtr<nsIURI> uri = do_CreateInstance(NS_STANDARDURL_CONTRACTID, &rv);
     if (NS_SUCCEEDED(rv)) {
       rv = uri->SetSpec(spec);
       if (NS_SUCCEEDED(rv))
-        rv = pps->DeprecatedBlockingResolve(uri, 0, proxyInfo);
+        rv = pps->Resolve(uri, 0, proxyInfo);
     }
   }
   return rv;
 }
 
 NS_MSG_BASE nsresult MsgPromptLoginFailed(nsIMsgWindow *aMsgWindow,
                                           const nsCString &aHostname,
                                           int32_t *aResult)
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -408,16 +408,18 @@
 @BINPATH@/components/nsLoginInfo.js
 @BINPATH@/components/nsLoginManager.js
 @BINPATH@/components/nsLoginManagerPrompter.js
 @BINPATH@/components/nsPlacesAutoComplete.js
 @BINPATH@/components/nsPlacesAutoComplete.manifest
 @BINPATH@/components/nsPlacesExpiration.js
 @BINPATH@/components/nsPrompter.js
 @BINPATH@/components/nsPrompter.manifest
+@BINPATH@/components/nsProxyAutoConfig.js
+@BINPATH@/components/nsProxyAutoConfig.manifest
 @BINPATH@/components/nsSearchService.js
 @BINPATH@/components/nsSearchSuggestions.js
 @BINPATH@/components/nsSessionStartup.js
 @BINPATH@/components/nsSessionStore.js
 @BINPATH@/components/nsSidebar.js
 @BINPATH@/components/nsSuiteDownloadManagerUI.js
 @BINPATH@/components/nsSuiteGlue.js
 #ifdef XP_WIN32
--- a/suite/installer/removed-files.in
+++ b/suite/installer/removed-files.in
@@ -124,18 +124,16 @@ components/nsInterfaceInfoToIDL.js
 components/nsKillAll.js
 components/nsLDAPPrefsService.js
 components/nsMicrosummaryService.js
 components/nsPlacesDBFlush.js
 #ifdef XP_WIN
 components/nsPostUpdateWin.js
 #endif
 components/nsProgressDialog.js
-components/nsProxyAutoConfig.js
-components/nsProxyAutoConfig.manifest
 components/nsResetPref.js
 components/nsScriptableIO.js
 components/nsSetDefaultBrowser.js
 components/nsSetDefaultMail.js
 components/nsUnsetDefaultMail.js
 #ifndef MOZ_UPDATER
 components/nsUpdateService.js
 components/nsUpdateServiceStub.js
@@ -673,16 +671,17 @@ xpicleanup@BIN_SUFFIX@
   components/nsLoginManager.js
   components/nsLoginManagerPrompter.js
   components/nsMailNewsCommandLineHandler.js
   components/nsMsgTraitService.js
   components/nsPlacesAutoComplete.js
   components/nsPlacesDBFlush.js
   components/nsPlacesExpiration.js
   components/nsPrompter.js
+  components/nsProxyAutoConfig.js
   components/nsSearchService.js
   components/nsSearchSuggestions.js
   components/nsSessionStartup.js
   components/nsSessionStore.js
   #ifdef XP_WIN
     components/nsSetDefault.js
   #endif
   components/nsSidebar.js