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

chrome/browser/safe_browsing/download_protection_service.cc

Index: chrome/browser/safe_browsing/download_protection_service.cc
===================================================================
--- chrome/browser/safe_browsing/download_protection_service.cc	(revision 281829)
+++ chrome/browser/safe_browsing/download_protection_service.cc	(working copy)
@@ -56,20 +56,6 @@
     "https://sb-ssl.google.com/safebrowsing/clientreport/download";
 
 namespace {
-ClientDownloadRequest::DownloadType GetDownloadType(
-    const base::FilePath& file) {
-  DCHECK(download_protection_util::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;
-}
-
 // List of extensions for which we track some UMA stats.
 enum MaliciousExtensionType {
   EXTENSION_EXE,
@@ -477,7 +463,7 @@
       *reason = REASON_NOT_BINARY_FILE;
       return false;
     }
-    *type = GetDownloadType(target_path);
+    *type = download_protection_util::GetDownloadType(target_path);
     return true;
   }