Backed out changeset 7441f4dde492 (bug 1038465) for hitting the network during tests.
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 15 Jul 2014 13:28:55 -0400
changeset 216113 83a246bb78608023951935a862420f9a86834165
parent 216112 8700531ef25f26efc098566331774c214bfab793
child 216114 95f2ad2787b32a3c5e493bad48ece712cbf4de3e
child 216142 df8c4d6994c6cd1e41b7d7e071573e593674eecf
push id515
push userraliiev@mozilla.com
push dateMon, 06 Oct 2014 12:51:51 +0000
treeherdermozilla-release@267c7a481bef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1038465
milestone33.0a1
backs out7441f4dde492536449823c3e1a6f5ee441b7775e
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 7441f4dde492 (bug 1038465) for hitting the network during tests.
toolkit/components/downloads/ApplicationReputation.cpp
toolkit/components/jsdownloads/src/DownloadIntegration.jsm
--- a/toolkit/components/downloads/ApplicationReputation.cpp
+++ b/toolkit/components/downloads/ApplicationReputation.cpp
@@ -356,21 +356,18 @@ PendingLookup::~PendingLookup()
 }
 
 bool
 PendingLookup::IsBinaryFile()
 {
   nsString fileName;
   nsresult rv = mQuery->GetSuggestedFileName(fileName);
   if (NS_FAILED(rv)) {
-    LOG(("No suggested filename [this = %p]", this));
     return false;
   }
-  LOG(("Suggested filename: %s [this = %p]",
-       NS_ConvertUTF16toUTF8(fileName).get(), this));
   return
     // Executable extensions for MS Windows, from
     // https://code.google.com/p/chromium/codesearch#chromium/src/chrome/common/safe_browsing/download_protection_util.cc&l=14
     StringEndsWith(fileName, NS_LITERAL_STRING(".apk")) ||
     StringEndsWith(fileName, NS_LITERAL_STRING(".bas")) ||
     StringEndsWith(fileName, NS_LITERAL_STRING(".bat")) ||
     StringEndsWith(fileName, NS_LITERAL_STRING(".cab")) ||
     StringEndsWith(fileName, NS_LITERAL_STRING(".cmd")) ||
--- a/toolkit/components/jsdownloads/src/DownloadIntegration.jsm
+++ b/toolkit/components/jsdownloads/src/DownloadIntegration.jsm
@@ -517,17 +517,16 @@ this.DownloadIntegration = {
     if (aDownload.source.referrer) {
       aReferrer: NetUtil.newURI(aDownload.source.referrer);
     }
     gApplicationReputationService.queryReputation({
       sourceURI: NetUtil.newURI(aDownload.source.url),
       referrerURI: aReferrer,
       fileSize: aDownload.currentBytes,
       sha256Hash: hash,
-      suggestedFileName: OS.Path.basename(aDownload.target.path),
       signatureInfo: sigInfo,
       redirects: channelRedirects },
       function onComplete(aShouldBlock, aRv) {
         deferred.resolve(aShouldBlock);
       });
     return deferred.promise;
   },