IDR_DOWNLOAD_FILE_TYPES updated

brave/brave_resources.grd

@@ -23,6 +23,7 @@
       <include name="IDR_CHROME_CONTENT_RENDERER_MANIFEST_OVERLAY" file="${root_gen_dir}\chrome\app\chrome_content_renderer_manifest_overlay.json" type="BINDATA" />
       <include name="IDR_CHROME_CONTENT_UTILITY_MANIFEST_OVERLAY" file="${root_gen_dir}\chrome\app\chrome_content_utility_manifest_overlay.json" type="BINDATA" />
       <include name="IDR_CRYPTOTOKEN_MANIFEST" file="..\..\chrome\browser\resources\cryptotoken\manifest.json" type="BINDATA" />
+      <include name="IDR_DOWNLOAD_FILE_TYPES_PB" file="${root_gen_dir}\chrome\browser\resources\safe_browsing\download_file_types.pb" use_base_dir="false" type="BINDATA" />
     </includes>
   </release>
 </grit>

patches/master_patch.patch

@@ -163,7 +163,7 @@ index e2faffbfcb27da0329d3e388fea8758d49139e8e..d8cdceffbc4b048395957dcae935a4c4
            "translate::mojom::ContentTranslateDriver"
          ],
 diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc
-index 4f4dadd98fd997e9659d10e6989916dbb0bb899e..06f1bad7f94378a78c22402f3b93317cca160ec8 100644
+index 4f4dadd98fd997e9659d10e6989916dbb0bb899e..6ac6030c3ae74c8df4a6081f5b38dc338c68d7ac 100644
 --- a/chrome/browser/download/download_target_determiner.cc
 +++ b/chrome/browser/download/download_target_determiner.cc
 @@ -650,6 +650,7 @@ DownloadTargetDeterminer::Result
@@ -174,14 +174,6 @@ index 4f4dadd98fd997e9659d10e6989916dbb0bb899e..06f1bad7f94378a78c22402f3b93317c
    next_state_ = STATE_CHECK_VISITED_REFERRER_BEFORE;
 
    // If user has validated a dangerous download, don't check.
-@@ -730,6 +731,7 @@ void DownloadTargetDeterminer::CheckVisitedReferrerBeforeDone(
-   danger_level_ = GetDangerLevel(
-       visited_referrer_before ? VISITED_REFERRER : NO_VISITS_TO_REFERRER);
-   if (danger_level_ != DownloadFileType::NOT_DANGEROUS &&
-+      danger_level_ != DownloadFileType::ALLOW_ON_USER_GESTURE &&
-       danger_type_ == content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS)
-     danger_type_ = content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE;
-   DoLoop();
 diff --git a/chrome/browser/importer/external_process_importer_client.h b/chrome/browser/importer/external_process_importer_client.h
 index 864a6951115dda5ed74963f18b35692960397d50..3e1a2b719521ac2c60bae05f94e409bc4c7da022 100644
 --- a/chrome/browser/importer/external_process_importer_client.h
@@ -532,23 +524,6 @@ index d85ddf9db90d332a31f839e7600b8d6e5ec61356..2dbe745b19001ce55631e625b6c597b2
    // Finds TabStripModel which has a WebContents whose id is the given
    // |tab_id|, and returns the WebContents index and the TabStripModel.
    int FindTabStripModelById(int32_t tab_id, TabStripModel** model) const;
-diff --git a/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc b/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
-index 7d32a4cc7a0f1d2230d1f965431a291424ae0db1..ed699539f22fad86ad581553974079c9b68038a9 100644
---- a/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
-+++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
-@@ -293,10 +293,12 @@ bool CheckClientDownloadRequest::IsSupportedDownload(
-     return false;
-   }
-   // This check should be last, so we know the earlier checks passed.
-+#if defined(MUON_CHROMIUM_BUILD)
-   if (!FileTypePolicies::GetInstance()->IsCheckedBinaryFile(target_path)) {
-     *reason = REASON_NOT_BINARY_FILE;
-     return false;
-   }
-+#endif
-   *type = download_protection_util::GetDownloadType(target_path);
-   return true;
- }
 diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
 index dadf0a941c71b1ec2e5cae6934246f9e6d7ebb89..34f323d8f0ef6150110463bb199075a96e5cd130 100644
 --- a/chrome/common/BUILD.gn