Merge 281089 "Include the latest binary download info in safe br..."

chrome/common/safe_browsing/download_protection_util.cc

Index: chrome/common/safe_browsing/download_protection_util.cc
===================================================================
--- chrome/common/safe_browsing/download_protection_util.cc	(revision 281829)
+++ chrome/common/safe_browsing/download_protection_util.cc	(working copy)
@@ -2,7 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/common/safe_browsing/download_protection_util.h"
+
 #include "base/files/file_path.h"
+#include "base/logging.h"
 
 namespace safe_browsing {
 namespace download_protection_util {
@@ -34,5 +37,19 @@
       IsArchiveFile(file));
 }
 
+ClientDownloadRequest::DownloadType GetDownloadType(
+    const base::FilePath& file) {
+  DCHECK(IsBinaryFile(file));
+  if (file.MatchesExtension(FILE_PATH_LITERAL(".apk")))
+    return ClientDownloadRequest::ANDROID_APK;
+  else if (file.MatchesExtension(FILE_PATH_LITERAL(".crx")))
+    return ClientDownloadRequest::CHROME_EXTENSION;
+  // For zip files, we use the ZIPPED_EXECUTABLE type since we will only send
+  // the pingback if we find an executable inside the zip archive.
+  else if (file.MatchesExtension(FILE_PATH_LITERAL(".zip")))
+    return ClientDownloadRequest::ZIPPED_EXECUTABLE;
+  return ClientDownloadRequest::WIN_EXECUTABLE;
+}
+
 }  // namespace download_protection_util
 }  // namespace safe_browsing