DownloadProtection: Add more graceful handling of verdict=UNKNOWN

chrome/browser/safe_browsing/download_protection_service_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/safe_browsing/download_protection_service.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
@@ skipping 948 matching lines @@
     &item,
     {"http://www.evil.com/a.exe"},  // url_chain
     "http://www.google.com/",       // referrer
     FILE_PATH_LITERAL("a.tmp"),     // tmp_path
     FILE_PATH_LITERAL("a.exe"));    // final_path
 
   EXPECT_CALL(*sb_service_->mock_database_manager(),
               MatchDownloadWhitelistUrl(_))
       .WillRepeatedly(Return(false));
   EXPECT_CALL(*binary_feature_extractor_.get(), CheckSignature(tmp_path_, _))
-      .Times(6);
+      .Times(7);
   EXPECT_CALL(*binary_feature_extractor_.get(),
               ExtractImageFeatures(
                   tmp_path_, BinaryFeatureExtractor::kDefaultOptions, _, _))
-      .Times(6);
+      .Times(7);
 
   download_service_->CheckClientDownload(
       &item,
       base::Bind(&DownloadProtectionServiceTest::CheckDoneCallback,
                  base::Unretained(this)));
   base::RunLoop().Run();
 
   EXPECT_TRUE(IsResult(DownloadProtectionService::SAFE));
   EXPECT_TRUE(HasClientDownloadRequest());
   ClearClientDownloadRequest();
@@ skipping 84 matching lines @@
 
   download_service_->CheckClientDownload(
       &item,
       base::Bind(&DownloadProtectionServiceTest::CheckDoneCallback,
                  base::Unretained(this)));
   base::RunLoop().Run();
 
   EXPECT_TRUE(IsResult(DownloadProtectionService::POTENTIALLY_UNWANTED));
   EXPECT_TRUE(HasClientDownloadRequest());
   ClearClientDownloadRequest();
+
+  // If the response is UNKNOWN the result should also be marked as
+  // UNKNOWN
+  PrepareResponse(
+      &factory, ClientDownloadResponse::UNKNOWN, net::HTTP_OK,
+      net::URLRequestStatus::SUCCESS);
+
+  download_service_->CheckClientDownload(
+      &item,
+      base::Bind(&DownloadProtectionServiceTest::CheckDoneCallback,
+                 base::Unretained(this)));
+  base::RunLoop().Run();
+
+  EXPECT_TRUE(IsResult(DownloadProtectionService::UNKNOWN));
+  EXPECT_TRUE(HasClientDownloadRequest());
+  ClearClientDownloadRequest();
 }
 
 TEST_F(DownloadProtectionServiceTest, CheckClientDownloadHTTPS) {
   net::FakeURLFetcherFactory factory(NULL);
   PrepareResponse(
       &factory, ClientDownloadResponse::DANGEROUS, net::HTTP_OK,
       net::URLRequestStatus::SUCCESS);
 
   content::MockDownloadItem item;
   PrepareBasicDownloadItem(&item,
@@ skipping 250 matching lines @@
   // !is_extended_reporting && !is_incognito
   CheckClientDownloadReportCorruptZip(true, false);
 }
 
 TEST_F(DownloadProtectionServiceTest,
        CheckClientDownloadReportCorruptZipIncognito) {
   // is_extended_reporting && is_incognito
   CheckClientDownloadReportCorruptZip(true, true);
 }
 
-TEST_F(DownloadProtectionServiceTest, CheckClientCrxDownloadSuccess) {
-  // Even if the server verdict is dangerous we should return SAFE because
-  // DownloadProtectionService::IsSupportedDownload() will return false
-  // for crx downloads.
-  net::FakeURLFetcherFactory factory(NULL);
-  PrepareResponse(
-      &factory, ClientDownloadResponse::DANGEROUS, net::HTTP_OK,
-      net::URLRequestStatus::SUCCESS);
-
-  content::MockDownloadItem item;
-  PrepareBasicDownloadItem(
-    &item,
-    {"http://www.evil.com/a.crx"},  // url_chain
-    "http://www.google.com/",       // referrer
-    FILE_PATH_LITERAL("a.tmp"),     // tmp_path
-    FILE_PATH_LITERAL("a.crx"));    // final_path
-
-  EXPECT_CALL(*sb_service_->mock_database_manager(),
-              MatchDownloadWhitelistUrl(_))
-      .WillRepeatedly(Return(false));
-  EXPECT_CALL(*binary_feature_extractor_.get(), CheckSignature(tmp_path_, _))
-      .Times(1);
-  EXPECT_CALL(*binary_feature_extractor_.get(),
-              ExtractImageFeatures(
-                  tmp_path_, BinaryFeatureExtractor::kDefaultOptions, _, _))
-              .Times(1);
-
-  EXPECT_FALSE(download_service_->IsSupportedDownload(item, final_path_));
-  download_service_->CheckClientDownload(
-      &item,
-      base::Bind(&DownloadProtectionServiceTest::CheckDoneCallback,
-                 base::Unretained(this)));
-  base::RunLoop().Run();
-  EXPECT_TRUE(IsResult(DownloadProtectionService::UNKNOWN));
-}
-
 TEST_F(DownloadProtectionServiceTest, CheckClientDownloadValidateRequest) {
   net::TestURLFetcherFactory factory;
 
   content::MockDownloadItem item;
   PrepareBasicDownloadItem(
     &item,
     {"http://www.google.com/",
      "http://www.google.com/bla.exe"},  // url_chain
     "http://www.google.com/",           // referrer
     FILE_PATH_LITERAL("bla.tmp"),       // tmp_path
@@ skipping 602 matching lines @@
     ClientDownloadResponse::Verdict verdict;
     DownloadProtectionService::DownloadCheckResult expected_result;
   } kExpectedResults[] = {
       {ClientDownloadResponse::SAFE, DownloadProtectionService::SAFE},
       {ClientDownloadResponse::DANGEROUS, DownloadProtectionService::DANGEROUS},
       {ClientDownloadResponse::UNCOMMON, DownloadProtectionService::UNCOMMON},
       {ClientDownloadResponse::DANGEROUS_HOST,
        DownloadProtectionService::DANGEROUS_HOST},
       {ClientDownloadResponse::POTENTIALLY_UNWANTED,
        DownloadProtectionService::POTENTIALLY_UNWANTED},
+      {ClientDownloadResponse::UNKNOWN, DownloadProtectionService::UNKNOWN},
   };
 
   for (const auto& test_case : kExpectedResults) {
     factory.ClearFakeResponses();
     PrepareResponse(&factory, test_case.verdict, net::HTTP_OK,
                     net::URLRequestStatus::SUCCESS);
     download_service_->CheckPPAPIDownloadRequest(
         GURL("http://example.com/foo"), default_file_path, alternate_extensions,
         base::Bind(&DownloadProtectionServiceTest::CheckDoneCallback,
                    base::Unretained(this)));
@@ skipping 239 matching lines @@
       &item, base::Bind(&DownloadProtectionServiceTest::CheckDoneCallback,
                         base::Unretained(this)));
   base::RunLoop().Run();
 
   EXPECT_FALSE(HasClientDownloadRequest());
   // Overriden by flag:
   EXPECT_TRUE(IsResult(DownloadProtectionService::DANGEROUS));
 }
 
 }  // namespace safe_browsing