Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1727)

Unified Diff: chrome/common/safe_browsing/download_protection_util.cc

Issue 555373005: Revert "Safebrowsing: allow sending enhanced download protection pings on OSX." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/safe_browsing/csd.proto ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/safe_browsing/download_protection_util.cc
diff --git a/chrome/common/safe_browsing/download_protection_util.cc b/chrome/common/safe_browsing/download_protection_util.cc
index a5a4befa3696ddcb9c723f5d9d97621a6a6cf14f..ee09cd1e1fe28982e58a8a4778923b48729df34e 100644
--- a/chrome/common/safe_browsing/download_protection_util.cc
+++ b/chrome/common/safe_browsing/download_protection_util.cc
@@ -11,7 +11,6 @@ namespace safe_browsing {
namespace download_protection_util {
bool IsArchiveFile(const base::FilePath& file) {
- // TODO(mattm): should .dmg be checked here instead of IsBinaryFile?
return file.MatchesExtension(FILE_PATH_LITERAL(".zip"));
}
@@ -34,11 +33,6 @@ bool IsBinaryFile(const base::FilePath& file) {
// Chrome extensions and android APKs are also reported.
file.MatchesExtension(FILE_PATH_LITERAL(".crx")) ||
file.MatchesExtension(FILE_PATH_LITERAL(".apk")) ||
- // Mac extensions.
- file.MatchesExtension(FILE_PATH_LITERAL(".dmg")) ||
- file.MatchesExtension(FILE_PATH_LITERAL(".pkg")) ||
- file.MatchesExtension(FILE_PATH_LITERAL(".osx")) ||
- file.MatchesExtension(FILE_PATH_LITERAL(".app")) ||
// Archives _may_ contain binaries, we'll check in ExtractFileFeatures.
IsArchiveFile(file));
}
@@ -54,11 +48,6 @@ ClientDownloadRequest::DownloadType GetDownloadType(
// the pingback if we find an executable inside the zip archive.
else if (file.MatchesExtension(FILE_PATH_LITERAL(".zip")))
return ClientDownloadRequest::ZIPPED_EXECUTABLE;
- else if (file.MatchesExtension(FILE_PATH_LITERAL(".dmg")) ||
- file.MatchesExtension(FILE_PATH_LITERAL(".pkg")) ||
- file.MatchesExtension(FILE_PATH_LITERAL(".osx")) ||
- file.MatchesExtension(FILE_PATH_LITERAL(".app")))
- return ClientDownloadRequest::MAC_EXECUTABLE;
return ClientDownloadRequest::WIN_EXECUTABLE;
}
« no previous file with comments | « chrome/common/safe_browsing/csd.proto ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698