diff -up chromium-69.0.3497.81/chrome/common/safe_browsing/BUILD.gn.nounrar chromium-69.0.3497.81/chrome/common/safe_browsing/BUILD.gn --- chromium-69.0.3497.81/chrome/common/safe_browsing/BUILD.gn.nounrar 2018-09-06 13:29:47.114511569 -0400 +++ chromium-69.0.3497.81/chrome/common/safe_browsing/BUILD.gn 2018-09-06 13:29:47.120511452 -0400 @@ -55,40 +55,6 @@ if (safe_browsing_mode == 1) { "//components/safe_browsing:csd_proto", ] } - - source_set("rar_analyzer") { - sources = [ - "rar_analyzer.cc", - "rar_analyzer.h", - ] - - deps = [ - ":archive_analyzer_results", - ":download_protection_util", - ":file_type_policies", - "//base", - "//base:i18n", - "//third_party/unrar:unrar", - ] - - defines = [ - "_FILE_OFFSET_BITS=64", - "LARGEFILE_SOURCE", - "RAR_SMP", - "SILENT", - - # The following is set to disable certain macro definitions in the unrar - # source code. - "CHROMIUM_UNRAR", - - # Disables exceptions in unrar, replaces them with process termination. - "UNRAR_NO_EXCEPTIONS", - ] - - public_deps = [ - "//components/safe_browsing:csd_proto", - ] - } } source_set("safe_browsing") { @@ -121,7 +87,6 @@ source_set("safe_browsing") { deps += [ ":archive_analyzer_results", ":download_protection_util", - ":rar_analyzer", "//components/safe_browsing:features", ] diff -up chromium-69.0.3497.81/chrome/common/safe_browsing/DEPS.nounrar chromium-69.0.3497.81/chrome/common/safe_browsing/DEPS --- chromium-69.0.3497.81/chrome/common/safe_browsing/DEPS.nounrar 2018-09-06 13:29:47.119511472 -0400 +++ chromium-69.0.3497.81/chrome/common/safe_browsing/DEPS 2018-09-06 13:29:47.116511530 -0400 @@ -1,6 +1,5 @@ include_rules = [ "+components/safe_browsing", "+third_party/protobuf", - "+third_party/unrar", "+third_party/zlib", ] diff -up chromium-69.0.3497.81/chrome/services/file_util/safe_archive_analyzer.cc.nounrar chromium-69.0.3497.81/chrome/services/file_util/safe_archive_analyzer.cc --- chromium-69.0.3497.81/chrome/services/file_util/safe_archive_analyzer.cc.nounrar 2018-09-07 10:10:42.286041744 -0400 +++ chromium-69.0.3497.81/chrome/services/file_util/safe_archive_analyzer.cc 2018-09-07 10:11:14.934308285 -0400 @@ -47,9 +47,13 @@ void SafeArchiveAnalyzer::AnalyzeDmgFile void SafeArchiveAnalyzer::AnalyzeRarFile(base::File rar_file, AnalyzeRarFileCallback callback) { +#if 0 DCHECK(rar_file.IsValid()); safe_browsing::ArchiveAnalyzerResults results; safe_browsing::rar_analyzer::AnalyzeRarFile(std::move(rar_file), &results); std::move(callback).Run(results); +#else + NOTREACHED(); +#endif }