From 3e0dadb346e64108113d6c763a12651b864bacde Mon Sep 17 00:00:00 2001 From: Kenny Ballou Date: Wed, 27 Mar 2019 22:28:00 -0600 Subject: Add debian disable patches for chromium-73 Add the set of patches from the debian project for disalbing certain features and configurations of chromium. Specifically, the `tracing.patch` seems to allow the package to compile. [0]: https://salsa.debian.org/chromium-team/chromium/tree/master/debian/patches/disable Signed-off-by: Kenny Ballou --- .../www-client/chromium-73.0.3683.75/android.patch | 24 + .../device-notifications.patch | 16 + .../www-client/chromium-73.0.3683.75/fuzzers.patch | 37 + .../chromium-73.0.3683.75/google-api-warning.patch | 16 + .../chromium-73.0.3683.75/installer.patch | 13 + .../chromium-73.0.3683.75/openh264.patch | 15 + .../chromium-73.0.3683.75/perfetto.patch | 14 + .../chromium-73.0.3683.75/swiftshader.patch | 14 + .../third-party-cookies.patch | 14 + .../www-client/chromium-73.0.3683.75/tracing.patch | 800 +++++++++++++++++++++ .../www-client/chromium-73.0.3683.75/unrar.patch | 87 +++ .../chromium-73.0.3683.75/welcome-page.patch | 15 + 12 files changed, 1065 insertions(+) create mode 100644 patches/www-client/chromium-73.0.3683.75/android.patch create mode 100644 patches/www-client/chromium-73.0.3683.75/device-notifications.patch create mode 100644 patches/www-client/chromium-73.0.3683.75/fuzzers.patch create mode 100644 patches/www-client/chromium-73.0.3683.75/google-api-warning.patch create mode 100644 patches/www-client/chromium-73.0.3683.75/installer.patch create mode 100644 patches/www-client/chromium-73.0.3683.75/openh264.patch create mode 100644 patches/www-client/chromium-73.0.3683.75/perfetto.patch create mode 100644 patches/www-client/chromium-73.0.3683.75/swiftshader.patch create mode 100644 patches/www-client/chromium-73.0.3683.75/third-party-cookies.patch create mode 100644 patches/www-client/chromium-73.0.3683.75/tracing.patch create mode 100644 patches/www-client/chromium-73.0.3683.75/unrar.patch create mode 100644 patches/www-client/chromium-73.0.3683.75/welcome-page.patch diff --git a/patches/www-client/chromium-73.0.3683.75/android.patch b/patches/www-client/chromium-73.0.3683.75/android.patch new file mode 100644 index 0000000..5c9c3f6 --- /dev/null +++ b/patches/www-client/chromium-73.0.3683.75/android.patch @@ -0,0 +1,24 @@ +description: disable dependency on chrome/android +author: Michael Gilbert + +--- a/device/vr/buildflags/buildflags.gni ++++ b/device/vr/buildflags/buildflags.gni +@@ -5,7 +5,6 @@ + import("//build/config/chrome_build.gni") + import("//build/config/chromecast_build.gni") + import("//build/config/gclient_args.gni") +-import("//chrome/android/channel.gni") + + declare_args() { + enable_gvr_services = is_android && !is_chromecast && +--- a/BUILD.gn ++++ b/BUILD.gn +@@ -367,7 +367,7 @@ group("gn_all") { + # seems currently broken for this platform at the moment, and the + # corresponding code build and works on Linux unmodified. + # See instructions in the corresponding BUILD.gn. +- if (is_linux) { ++ if (is_android) { + deps += + [ "//third_party/android_crazy_linker:android_crazy_linker_zip_fuzzer" ] + } diff --git a/patches/www-client/chromium-73.0.3683.75/device-notifications.patch b/patches/www-client/chromium-73.0.3683.75/device-notifications.patch new file mode 100644 index 0000000..d428e7e --- /dev/null +++ b/patches/www-client/chromium-73.0.3683.75/device-notifications.patch @@ -0,0 +1,16 @@ +description: disable device discovery notifications by default +author: Michael Gilbert +bug-debian: http://bugs.debian.org/856571 + +--- a/chrome/browser/printing/cloud_print/privet_notifications.cc ++++ b/chrome/browser/printing/cloud_print/privet_notifications.cc +@@ -229,8 +229,7 @@ void PrivetNotificationService::DeviceCa + // static + bool PrivetNotificationService::IsEnabled() { + base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); +- return !command_line->HasSwitch( +- switches::kDisableDeviceDiscoveryNotifications); ++ return command_line->HasSwitch(switches::kEnableDeviceDiscoveryNotifications); + } + + // static diff --git a/patches/www-client/chromium-73.0.3683.75/fuzzers.patch b/patches/www-client/chromium-73.0.3683.75/fuzzers.patch new file mode 100644 index 0000000..4ad0a1b --- /dev/null +++ b/patches/www-client/chromium-73.0.3683.75/fuzzers.patch @@ -0,0 +1,37 @@ +description: fuzzers aren't built, so don't depend on them +author: Michael Gilbert + +--- a/BUILD.gn ++++ b/BUILD.gn +@@ -717,8 +717,7 @@ group("gn_all") { + } + } + +- if ((is_linux && !is_chromecast) || +- (is_win && (use_drfuzz || use_libfuzzer)) || (use_libfuzzer && is_mac)) { ++ if (false) { + deps += [ + "//testing/libfuzzer/fuzzers", + "//third_party/icu/fuzzers", +--- a/content/test/BUILD.gn ++++ b/content/test/BUILD.gn +@@ -2270,9 +2270,3 @@ test("content_perftests") { + deps += [ "//testing/android/native_test:native_test_native_code" ] + } + } +- +-group("fuzzers") { +- deps = [ +- "//content/test/fuzzer", +- ] +-} +--- a/v8/tools/BUILD.gn ++++ b/v8/tools/BUILD.gn +@@ -11,7 +11,6 @@ group("gn_all") { + data_deps = [ + ":v8_check_static_initializers", + "gcmole:v8_run_gcmole", +- "jsfunfuzz:v8_jsfunfuzz", + ] + } + diff --git a/patches/www-client/chromium-73.0.3683.75/google-api-warning.patch b/patches/www-client/chromium-73.0.3683.75/google-api-warning.patch new file mode 100644 index 0000000..2692a13 --- /dev/null +++ b/patches/www-client/chromium-73.0.3683.75/google-api-warning.patch @@ -0,0 +1,16 @@ +description: disable the google api key warning when those aren't found +author: Michael Gilbert + +--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc ++++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc +@@ -807,10 +807,6 @@ void StartupBrowserCreatorImpl::AddInfoB + chrome::ShowBadFlagsPrompt(web_contents); + InfoBarService* infobar_service = + InfoBarService::FromWebContents(web_contents); +- if (!google_apis::HasAPIKeyConfigured() || +- !google_apis::HasOAuthClientConfigured()) { +- GoogleApiKeysInfoBarDelegate::Create(infobar_service); +- } + if (ObsoleteSystem::IsObsoleteNowOrSoon()) { + PrefService* local_state = g_browser_process->local_state(); + if (!local_state || diff --git a/patches/www-client/chromium-73.0.3683.75/installer.patch b/patches/www-client/chromium-73.0.3683.75/installer.patch new file mode 100644 index 0000000..3662148 --- /dev/null +++ b/patches/www-client/chromium-73.0.3683.75/installer.patch @@ -0,0 +1,13 @@ +description: avoid building chromium's installer, which is unused in debian +author: Michael Gilbert + +--- a/BUILD.gn ++++ b/BUILD.gn +@@ -66,7 +66,6 @@ group("gn_all") { + ":gn_visibility", + "//base:base_perftests", + "//base:base_unittests", +- "//chrome/installer", + "//net:net_unittests", + "//skia:skia_unittests", + "//sql:sql_unittests", diff --git a/patches/www-client/chromium-73.0.3683.75/openh264.patch b/patches/www-client/chromium-73.0.3683.75/openh264.patch new file mode 100644 index 0000000..9bc3399 --- /dev/null +++ b/patches/www-client/chromium-73.0.3683.75/openh264.patch @@ -0,0 +1,15 @@ +description: disable support for openh264, will be added later +author: Michael Gilbert + +--- a/third_party/webrtc/webrtc.gni ++++ b/third_party/webrtc/webrtc.gni +@@ -159,8 +159,7 @@ declare_args() { + # + # Enabling H264 when building with MSVC is currently not supported, see + # bugs.webrtc.org/9213#c13 for more info. +- rtc_use_h264 = +- proprietary_codecs && !is_android && !is_ios && !(is_win && !is_clang) ++ rtc_use_h264 = false + + # By default, use normal platform audio support or dummy audio, but don't + # use file-based audio playout and record. diff --git a/patches/www-client/chromium-73.0.3683.75/perfetto.patch b/patches/www-client/chromium-73.0.3683.75/perfetto.patch new file mode 100644 index 0000000..2e2522a --- /dev/null +++ b/patches/www-client/chromium-73.0.3683.75/perfetto.patch @@ -0,0 +1,14 @@ +description: disable dependencies on third_party/perfetto +author: Michael Gilbert + +--- a/BUILD.gn ++++ b/BUILD.gn +@@ -661,7 +661,7 @@ group("gn_all") { + } + } + +- if (is_mac || is_linux || is_android || is_fuchsia) { ++ if (false) { + deps += [ "//third_party/perfetto:all" ] + } + diff --git a/patches/www-client/chromium-73.0.3683.75/swiftshader.patch b/patches/www-client/chromium-73.0.3683.75/swiftshader.patch new file mode 100644 index 0000000..887cf5a --- /dev/null +++ b/patches/www-client/chromium-73.0.3683.75/swiftshader.patch @@ -0,0 +1,14 @@ +description: avoid building the swiftshader library +author: Michael Gilbert + +--- a/BUILD.gn ++++ b/BUILD.gn +@@ -446,7 +446,7 @@ group("gn_all") { + ] + } + +- if ((is_win || is_mac || is_linux || is_chromeos || is_fuchsia) && ++ if (false && + (target_cpu == "x86" || target_cpu == "x64")) { + deps += [ "//third_party/swiftshader" ] + } diff --git a/patches/www-client/chromium-73.0.3683.75/third-party-cookies.patch b/patches/www-client/chromium-73.0.3683.75/third-party-cookies.patch new file mode 100644 index 0000000..3092e7b --- /dev/null +++ b/patches/www-client/chromium-73.0.3683.75/third-party-cookies.patch @@ -0,0 +1,14 @@ +description: disable third-party cookies by default +author: Chad Miller + +--- a/components/content_settings/core/browser/cookie_settings.cc ++++ b/components/content_settings/core/browser/cookie_settings.cc +@@ -50,7 +50,7 @@ void CookieSettings::GetCookieSettings( + void CookieSettings::RegisterProfilePrefs( + user_prefs::PrefRegistrySyncable* registry) { + registry->RegisterBooleanPref( +- prefs::kBlockThirdPartyCookies, false, ++ prefs::kBlockThirdPartyCookies, true, + user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); + } + diff --git a/patches/www-client/chromium-73.0.3683.75/tracing.patch b/patches/www-client/chromium-73.0.3683.75/tracing.patch new file mode 100644 index 0000000..66892d7 --- /dev/null +++ b/patches/www-client/chromium-73.0.3683.75/tracing.patch @@ -0,0 +1,800 @@ +description: disable tracing, it depends on too many sourceless javascript files +author: Michael Gilbert + +--- a/chrome/browser/BUILD.gn ++++ b/chrome/browser/BUILD.gn +@@ -1605,14 +1605,6 @@ jumbo_split_static_library("browser") { + "thumbnails/thumbnail_utils.h", + "thumbnails/thumbnailing_context.cc", + "thumbnails/thumbnailing_context.h", +- "tracing/background_tracing_field_trial.cc", +- "tracing/background_tracing_field_trial.h", +- "tracing/chrome_tracing_delegate.cc", +- "tracing/chrome_tracing_delegate.h", +- "tracing/crash_service_uploader.cc", +- "tracing/crash_service_uploader.h", +- "tracing/navigation_tracing.cc", +- "tracing/navigation_tracing.h", + "translate/android/translate_utils.cc", + "translate/android/translate_utils.h", + "translate/chrome_translate_client.cc", +@@ -1886,7 +1878,6 @@ jumbo_split_static_library("browser") { + "//components/sync_preferences", + "//components/sync_sessions", + "//components/task_scheduler_util", +- "//components/tracing:startup_tracing", + "//components/translate/content/browser", + "//components/translate/core/browser", + "//components/translate/core/common", +--- a/content/browser/BUILD.gn ++++ b/content/browser/BUILD.gn +@@ -61,8 +61,6 @@ jumbo_source_set("browser") { + "//components/rappor", + "//components/services/filesystem:lib", + "//components/services/leveldb:lib", +- "//components/tracing", +- "//components/tracing:startup_tracing", + "//components/ui_devtools", + "//components/url_formatter", + "//components/variations", +@@ -163,9 +161,6 @@ jumbo_source_set("browser") { + "//services/service_manager/zygote:zygote_buildflags", + "//services/shape_detection:lib", + "//services/shape_detection/public/mojom", +- "//services/tracing:lib", +- "//services/tracing:manifest", +- "//services/tracing/public/cpp", + "//services/video_capture:lib", + "//services/video_capture/public/cpp", + "//services/video_capture/public/mojom:constants", +@@ -724,8 +719,6 @@ jumbo_source_set("browser") { + "devtools/protocol/target_handler.h", + "devtools/protocol/tethering_handler.cc", + "devtools/protocol/tethering_handler.h", +- "devtools/protocol/tracing_handler.cc", +- "devtools/protocol/tracing_handler.h", + "devtools/protocol_string.cc", + "devtools/protocol_string.h", + "devtools/render_frame_devtools_agent_host.cc", +@@ -1768,25 +1761,6 @@ jumbo_source_set("browser") { + "streams/stream_write_observer.h", + "theme_helper_mac.h", + "theme_helper_mac.mm", +- "tracing/background_memory_tracing_observer.cc", +- "tracing/background_memory_tracing_observer.h", +- "tracing/background_startup_tracing_observer.cc", +- "tracing/background_startup_tracing_observer.h", +- "tracing/background_tracing_config_impl.cc", +- "tracing/background_tracing_config_impl.h", +- "tracing/background_tracing_manager_impl.cc", +- "tracing/background_tracing_manager_impl.h", +- "tracing/background_tracing_rule.cc", +- "tracing/background_tracing_rule.h", +- "tracing/file_tracing_provider_impl.cc", +- "tracing/file_tracing_provider_impl.h", +- "tracing/trace_message_filter.cc", +- "tracing/trace_message_filter.h", +- "tracing/tracing_controller_impl.cc", +- "tracing/tracing_controller_impl.h", +- "tracing/tracing_controller_impl_data_endpoint.cc", +- "tracing/tracing_ui.cc", +- "tracing/tracing_ui.h", + "url_loader_factory_getter.cc", + "url_loader_factory_getter.h", + "utility_process_host.cc", +@@ -2004,7 +1978,6 @@ jumbo_source_set("browser") { + if (!is_android) { + deps += [ + "//components/vector_icons", +- "//content/browser/tracing:resources", + ] + } + +--- a/content/shell/BUILD.gn ++++ b/content/shell/BUILD.gn +@@ -508,7 +508,6 @@ repack("pak") { + sources = [ + "$root_gen_dir/content/app/resources/content_resources_100_percent.pak", + "$root_gen_dir/content/app/strings/content_strings_en-US.pak", +- "$root_gen_dir/content/browser/tracing/tracing_resources.pak", + "$root_gen_dir/content/content_resources.pak", + "$root_gen_dir/content/shell/shell_resources.pak", + "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak", +@@ -526,7 +525,6 @@ repack("pak") { + "//content:resources", + "//content/app/resources", + "//content/app/strings", +- "//content/browser/tracing:resources", + "//mojo/public/js:resources", + "//net:net_resources", + "//third_party/blink/public:resources", +--- a/headless/BUILD.gn ++++ b/headless/BUILD.gn +@@ -39,7 +39,6 @@ repack("pak") { + "$root_gen_dir/content/app/resources/content_resources_100_percent.pak", + "$root_gen_dir/content/app/strings/content_strings_en-US.pak", + "$root_gen_dir/content/browser/devtools/devtools_resources.pak", +- "$root_gen_dir/content/browser/tracing/tracing_resources.pak", + "$root_gen_dir/content/content_resources.pak", + "$root_gen_dir/headless/headless_lib_resources.pak", + "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak", +@@ -66,7 +65,6 @@ repack("pak") { + "//content/app/resources", + "//content/app/strings", + "//content/browser/devtools:resources", +- "//content/browser/tracing:resources", + "//mojo/public/js:resources", + "//net:net_resources", + "//third_party/blink/public:resources", +--- a/chrome/chrome_paks.gni ++++ b/chrome/chrome_paks.gni +@@ -100,7 +100,6 @@ template("chrome_extra_paks") { + "$root_gen_dir/chrome/task_scheduler_internals_resources.pak", + "$root_gen_dir/chrome/translate_internals_resources.pak", + "$root_gen_dir/components/components_resources.pak", +- "$root_gen_dir/content/browser/tracing/tracing_resources.pak", + "$root_gen_dir/content/content_resources.pak", + "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak", + "$root_gen_dir/net/net_resources.pak", +@@ -118,7 +117,6 @@ template("chrome_extra_paks") { + "//chrome/common:resources", + "//components/resources", + "//content:resources", +- "//content/browser/tracing:resources", + "//mojo/public/js:resources", + "//net:net_resources", + "//third_party/blink/public:resources", +--- a/content/browser/browser_child_process_host_impl.cc ++++ b/content/browser/browser_child_process_host_impl.cc +@@ -34,7 +34,6 @@ + #include "content/browser/histogram_controller.h" + #include "content/browser/loader/resource_message_filter.h" + #include "content/browser/service_manager/service_manager_context.h" +-#include "content/browser/tracing/trace_message_filter.h" + #include "content/common/child_process_host_impl.h" + #include "content/common/service_manager/child_connection.h" + #include "content/public/browser/browser_child_process_host_delegate.h" +@@ -163,7 +162,6 @@ BrowserChildProcessHostImpl::BrowserChil + data_.id = ChildProcessHostImpl::GenerateChildProcessUniqueId(); + + child_process_host_ = ChildProcessHost::Create(this); +- AddFilter(new TraceMessageFilter(data_.id)); + + g_child_process_list.Get().push_back(this); + GetContentClient()->browser()->BrowserChildProcessHostCreated(this); +--- a/content/public/browser/background_tracing_config.cc ++++ b/content/public/browser/background_tracing_config.cc +@@ -4,8 +4,6 @@ + + #include "content/public/browser/background_tracing_config.h" + +-#include "content/browser/tracing/background_tracing_config_impl.h" +- + namespace content { + + BackgroundTracingConfig::BackgroundTracingConfig(TracingMode tracing_mode) +@@ -15,7 +13,7 @@ BackgroundTracingConfig::~BackgroundTrac + + std::unique_ptr BackgroundTracingConfig::FromDict( + const base::DictionaryValue* dict) { +- return BackgroundTracingConfigImpl::FromDict(dict); ++ return nullptr; + } + + } // namespace content +--- a/content/public/browser/background_tracing_config.h ++++ b/content/public/browser/background_tracing_config.h +@@ -34,7 +34,6 @@ class CONTENT_EXPORT BackgroundTracingCo + virtual void IntoDict(base::DictionaryValue* dict) const = 0; + + private: +- friend class BackgroundTracingConfigImpl; + explicit BackgroundTracingConfig(TracingMode tracing_mode); + + const TracingMode tracing_mode_; +--- a/content/browser/browser_main_loop.cc ++++ b/content/browser/browser_main_loop.cc +@@ -91,8 +91,6 @@ + #include "content/browser/speech/speech_recognition_manager_impl.h" + #include "content/browser/startup_data_impl.h" + #include "content/browser/startup_task_runner.h" +-#include "content/browser/tracing/background_tracing_manager_impl.h" +-#include "content/browser/tracing/tracing_controller_impl.h" + #include "content/browser/utility_process_host.h" + #include "content/browser/webrtc/webrtc_internals.h" + #include "content/browser/webui/content_web_ui_controller_factory.h" +@@ -1582,10 +1580,6 @@ void BrowserMainLoop::InitializeMojo() { + // know they're running in the same process as the service. + content::NavigableContentsView::SetClientRunningInServiceProcess(); + +- tracing_controller_ = std::make_unique(); +- content::BackgroundTracingManagerImpl::GetInstance() +- ->AddMetadataGeneratorFunction(); +- + // Registers the browser process as a memory-instrumentation client, so + // that data for the browser process will be available in memory dumps. + service_manager::Connector* connector = +@@ -1595,29 +1589,6 @@ void BrowserMainLoop::InitializeMojo() { + memory_instrumentation::mojom::ProcessType::BROWSER); + memory_instrumentation::ClientProcessImpl::CreateInstance(config); + +- // Start startup tracing through TracingController's interface. TraceLog has +- // been enabled in content_main_runner where threads are not available. Now We +- // need to start tracing for all other tracing agents, which require threads. +- auto* trace_startup_config = tracing::TraceStartupConfig::GetInstance(); +- if (trace_startup_config->IsEnabled()) { +- // This checks kTraceConfigFile switch. +- TracingController::GetInstance()->StartTracing( +- trace_startup_config->GetTraceConfig(), +- TracingController::StartTracingDoneCallback()); +- } else if (parsed_command_line_.HasSwitch(switches::kTraceToConsole)) { +- TracingController::GetInstance()->StartTracing( +- tracing::GetConfigForTraceToConsole(), +- TracingController::StartTracingDoneCallback()); +- } +- // Start tracing to a file for certain duration if needed. Only do this after +- // starting the main message loop to avoid calling +- // MessagePumpForUI::ScheduleWork() before MessagePumpForUI::Start() as it +- // will crash the browser. +- if (trace_startup_config->IsTracingStartupForDuration()) { +- TRACE_EVENT0("startup", "BrowserMainLoop::InitStartupTracingForDuration"); +- InitStartupTracingForDuration(); +- } +- + if (parts_) { + parts_->ServiceManagerConnectionStarted( + ServiceManagerConnection::GetForProcess()); +@@ -1658,14 +1629,7 @@ void BrowserMainLoop::InitStartupTracing + } + + void BrowserMainLoop::EndStartupTracing() { +- // Do nothing if startup tracing is already stopped. +- if (!tracing::TraceStartupConfig::GetInstance()->IsEnabled()) +- return; +- +- TracingController::GetInstance()->StopTracing( +- TracingController::CreateFileEndpoint( +- startup_trace_file_, +- base::Bind(OnStoppedStartupTracing, startup_trace_file_))); ++ return; + } + + void BrowserMainLoop::InitializeAudio() { +--- a/content/browser/browser_main_loop.h ++++ b/content/browser/browser_main_loop.h +@@ -397,7 +397,6 @@ class CONTENT_EXPORT BrowserMainLoop { + std::unique_ptr + discardable_shared_memory_manager_; + scoped_refptr save_file_manager_; +- std::unique_ptr tracing_controller_; + scoped_refptr responsiveness_watcher_; + #if !defined(OS_ANDROID) + // A SharedBitmapManager used to sharing and mapping IDs to shared memory +--- a/content/browser/devtools/browser_devtools_agent_host.cc ++++ b/content/browser/devtools/browser_devtools_agent_host.cc +@@ -20,7 +20,6 @@ + #include "content/browser/devtools/protocol/system_info_handler.h" + #include "content/browser/devtools/protocol/target_handler.h" + #include "content/browser/devtools/protocol/tethering_handler.h" +-#include "content/browser/devtools/protocol/tracing_handler.h" + #include "content/browser/frame_host/frame_tree_node.h" + + namespace content { +@@ -87,8 +86,6 @@ bool BrowserDevToolsAgentHost::AttachSes + session->AddHandler(std::make_unique( + socket_callback_, tethering_task_runner_)); + } +- session->AddHandler( +- std::make_unique(nullptr, GetIOContext())); + return true; + } + +--- a/content/browser/devtools/render_frame_devtools_agent_host.cc ++++ b/content/browser/devtools/render_frame_devtools_agent_host.cc +@@ -35,7 +35,6 @@ + #include "content/browser/devtools/protocol/service_worker_handler.h" + #include "content/browser/devtools/protocol/storage_handler.h" + #include "content/browser/devtools/protocol/target_handler.h" +-#include "content/browser/devtools/protocol/tracing_handler.h" + #include "content/browser/frame_host/navigation_handle_impl.h" + #include "content/browser/frame_host/navigation_request.h" + #include "content/browser/frame_host/render_frame_host_impl.h" +@@ -302,10 +301,6 @@ bool RenderFrameDevToolsAgentHost::Attac + session->AddHandler(base::WrapUnique(new protocol::PageHandler( + emulation_handler, session->client()->MayAffectLocalFiles()))); + session->AddHandler(base::WrapUnique(new protocol::SecurityHandler())); +- if (!frame_tree_node_ || !frame_tree_node_->parent()) { +- session->AddHandler(base::WrapUnique( +- new protocol::TracingHandler(frame_tree_node_, GetIOContext()))); +- } + + if (sessions().empty()) { + bool use_video_capture_api = true; +@@ -366,8 +361,6 @@ void RenderFrameDevToolsAgentHost::Ready + NavigationHandle* navigation_handle) { + NavigationHandleImpl* handle = + static_cast(navigation_handle); +- for (auto* tracing : protocol::TracingHandler::ForAgentHost(this)) +- tracing->ReadyToCommitNavigation(handle); + + if (handle->frame_tree_node() != frame_tree_node_) { + if (ShouldForceCreation() && handle->GetRenderFrameHost() && +@@ -474,8 +467,6 @@ void RenderFrameDevToolsAgentHost::Rende + + void RenderFrameDevToolsAgentHost::FrameDeleted(RenderFrameHost* rfh) { + RenderFrameHostImpl* host = static_cast(rfh); +- for (auto* tracing : protocol::TracingHandler::ForAgentHost(this)) +- tracing->FrameDeleted(host); + if (host->frame_tree_node() == frame_tree_node_) { + DestroyOnRenderFrameGone(); + // |this| may be deleted at this point. +@@ -721,8 +712,6 @@ void RenderFrameDevToolsAgentHost::Synch + if (!frame_trace_recorder_) + return; + bool did_initiate_recording = false; +- for (auto* tracing : protocol::TracingHandler::ForAgentHost(this)) +- did_initiate_recording |= tracing->did_initiate_recording(); + if (did_initiate_recording) { + frame_trace_recorder_->OnSynchronousSwapCompositorFrame(frame_host_, + frame_metadata); +--- a/content/browser/renderer_host/render_process_host_impl.cc ++++ b/content/browser/renderer_host/render_process_host_impl.cc +@@ -137,7 +137,6 @@ + #include "content/browser/site_instance_impl.h" + #include "content/browser/storage_partition_impl.h" + #include "content/browser/streams/stream_context.h" +-#include "content/browser/tracing/trace_message_filter.h" + #include "content/browser/webrtc/webrtc_internals.h" + #include "content/browser/websockets/websocket_manager.h" + #include "content/browser/webui/web_ui_controller_factory_registry.h" +@@ -2044,7 +2043,6 @@ void RenderProcessHostImpl::CreateMessag + p2p_socket_dispatcher_host_ = + std::make_unique(GetID()); + +- AddFilter(new TraceMessageFilter(GetID())); + AddFilter(new ResolveProxyMsgHelper(GetID())); + + scoped_refptr service_worker_context( +--- a/content/browser/webui/content_web_ui_controller_factory.cc ++++ b/content/browser/webui/content_web_ui_controller_factory.cc +@@ -13,7 +13,6 @@ + #include "content/browser/net/network_errors_listing_ui.h" + #include "content/browser/process_internals/process_internals_ui.h" + #include "content/browser/service_worker/service_worker_internals_ui.h" +-#include "content/browser/tracing/tracing_ui.h" + #include "content/browser/webrtc/webrtc_internals_ui.h" + #include "content/public/browser/storage_partition.h" + #include "content/public/browser/web_contents.h" +@@ -76,7 +75,7 @@ ContentWebUIControllerFactory::CreateWeb + return std::make_unique(web_ui); + if (url.host_piece() == kChromeUINetworkErrorsListingHost) + return std::make_unique(web_ui); +-#if !defined(OS_ANDROID) ++#if 0 + if (url.host_piece() == kChromeUITracingHost) + return std::make_unique(web_ui); + #endif +--- a/chrome/browser/chrome_browser_main.cc ++++ b/chrome/browser/chrome_browser_main.cc +@@ -94,8 +94,6 @@ + #include "chrome/browser/resource_coordinator/render_process_probe.h" + #include "chrome/browser/sessions/chrome_serialized_navigation_driver.h" + #include "chrome/browser/shell_integration.h" +-#include "chrome/browser/tracing/background_tracing_field_trial.h" +-#include "chrome/browser/tracing/navigation_tracing.h" + #include "chrome/browser/translate/translate_service.h" + #include "chrome/browser/ui/browser.h" + #include "chrome/browser/ui/browser_finder.h" +@@ -1080,12 +1078,6 @@ int ChromeBrowserMainParts::PreCreateThr + #endif // defined(OS_WIN) + #endif // BUILDFLAG(ENABLE_VR) + +- // Enable Navigation Tracing only if a trace upload url is specified. +- if (parsed_command_line_.HasSwitch(switches::kEnableNavigationTracing) && +- parsed_command_line_.HasSwitch(switches::kTraceUploadURL)) { +- tracing::SetupNavigationTracing(); +- } +- + #if defined(OS_WIN) || defined(OS_MACOSX) || \ + (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + metrics::DesktopSessionDurationTracker::Initialize(); +@@ -1162,10 +1154,6 @@ void ChromeBrowserMainParts::PostCreateT + + void ChromeBrowserMainParts::ServiceManagerConnectionStarted( + content::ServiceManagerConnection* connection) { +- // This should be called after the creation of the tracing controller. The +- // tracing controller is created when the service manager connection is +- // started. +- tracing::SetupBackgroundTracingFieldTrial(); + + for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) + chrome_extra_parts_[i]->ServiceManagerConnectionStarted(connection); +--- a/chrome/browser/chrome_content_browser_client.cc ++++ b/chrome/browser/chrome_content_browser_client.cc +@@ -133,7 +133,6 @@ + #include "chrome/browser/subresource_filter/chrome_subresource_filter_client.h" + #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h" + #include "chrome/browser/tab_contents/tab_util.h" +-#include "chrome/browser/tracing/chrome_tracing_delegate.h" + #include "chrome/browser/translate/translate_service.h" + #include "chrome/browser/ui/blocked_content/blocked_window_params.h" + #include "chrome/browser/ui/blocked_content/popup_blocker.h" +@@ -4330,7 +4329,7 @@ ChromeContentBrowserClient::GetDevToolsM + } + + content::TracingDelegate* ChromeContentBrowserClient::GetTracingDelegate() { +- return new ChromeTracingDelegate(); ++ return nullptr; + } + + bool ChromeContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle( +--- a/chrome/browser/prefs/browser_prefs.cc ++++ b/chrome/browser/prefs/browser_prefs.cc +@@ -61,7 +61,6 @@ + #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h" + #include "chrome/browser/ssl/ssl_config_service_manager.h" + #include "chrome/browser/task_manager/task_manager_interface.h" +-#include "chrome/browser/tracing/chrome_tracing_delegate.h" + #include "chrome/browser/ui/blocked_content/safe_browsing_triggered_popup_blocker.h" + #include "chrome/browser/ui/browser_ui_prefs.h" + #include "chrome/browser/ui/navigation_correction_tab_observer.h" +@@ -428,7 +427,6 @@ void RegisterLocalState(PrefRegistrySimp + BrowserProcessImpl::RegisterPrefs(registry); + ChromeContentBrowserClient::RegisterLocalStatePrefs(registry); + ChromeMetricsServiceClient::RegisterPrefs(registry); +- ChromeTracingDelegate::RegisterPrefs(registry); + component_updater::RegisterPrefs(registry); + ExternalProtocolHandler::RegisterPrefs(registry); + flags_ui::PrefServiceFlagsStorage::RegisterPrefs(registry); +--- a/chrome/browser/lifetime/browser_shutdown.cc ++++ b/chrome/browser/lifetime/browser_shutdown.cc +@@ -372,9 +372,6 @@ void StartShutdownTracing() { + if (command_line.HasSwitch(switches::kTraceShutdown)) { + base::trace_event::TraceConfig trace_config( + command_line.GetSwitchValueASCII(switches::kTraceShutdown), ""); +- content::TracingController::GetInstance()->StartTracing( +- trace_config, +- content::TracingController::StartTracingDoneCallback()); + } + TRACE_EVENT0("shutdown", "StartShutdownTracing"); + } +--- a/chrome/browser/sessions/tab_loader.cc ++++ b/chrome/browser/sessions/tab_loader.cc +@@ -18,7 +18,6 @@ + #include "chrome/browser/ui/browser.h" + #include "chrome/browser/ui/browser_finder.h" + #include "components/favicon/content/content_favicon_driver.h" +-#include "content/public/browser/background_tracing_manager.h" + #include "content/public/browser/navigation_controller.h" + #include "content/public/browser/web_contents.h" + #include "content/public/common/content_features.h" +@@ -29,15 +28,6 @@ using resource_coordinator::TabLoadTrack + namespace { + + void BackgroundTracingTrigger() { +- static content::BackgroundTracingManager::TriggerHandle trigger_handle_ = -1; +- if (trigger_handle_ == -1) { +- trigger_handle_ = +- content::BackgroundTracingManager::GetInstance()->RegisterTriggerType( +- "session-restore-config"); +- } +- content::BackgroundTracingManager::GetInstance()->TriggerNamedEvent( +- trigger_handle_, +- content::BackgroundTracingManager::StartedFinalizingCallback()); + } + + const base::TickClock* GetDefaultTickClock() { +--- a/components/feedback/tracing_manager.cc ++++ b/components/feedback/tracing_manager.cc +@@ -10,7 +10,6 @@ + #include "base/single_thread_task_runner.h" + #include "base/threading/thread_task_runner_handle.h" + #include "components/feedback/feedback_util.h" +-#include "content/public/browser/tracing_controller.h" + + namespace { + +@@ -43,10 +42,6 @@ int TracingManager::RequestTrace() { + + current_trace_id_ = g_next_trace_id; + ++g_next_trace_id; +- content::TracingController::GetInstance()->StopTracing( +- content::TracingController::CreateStringEndpoint( +- base::Bind(&TracingManager::OnTraceDataCollected, +- weak_ptr_factory_.GetWeakPtr()))); + return current_trace_id_; + } + +@@ -89,9 +84,6 @@ void TracingManager::DiscardTraceData(in + } + + void TracingManager::StartTracing() { +- content::TracingController::GetInstance()->StartTracing( +- base::trace_event::TraceConfig(), +- content::TracingController::StartTracingDoneCallback()); + } + + void TracingManager::OnTraceDataCollected( +--- a/chrome/browser/profiling_host/profiling_process_host.cc ++++ b/chrome/browser/profiling_host/profiling_process_host.cc +@@ -20,7 +20,6 @@ + #include "base/values.h" + #include "build/build_config.h" + #include "chrome/browser/browser_process.h" +-#include "chrome/browser/tracing/crash_service_uploader.h" + #include "components/heap_profiling/supervisor.h" + #include "components/services/heap_profiling/public/cpp/controller.h" + #include "components/services/heap_profiling/public/cpp/settings.h" +@@ -46,21 +45,6 @@ const char kConfigCategoryKey[] = "categ + const char kConfigCategoryMemlog[] = "MEMLOG"; + const char kOOPHeapProfilingUploadUrl[] = "upload_url"; + +-void OnTraceUploadComplete(TraceCrashServiceUploader* uploader, +- bool success, +- const std::string& feedback) { +- UMA_HISTOGRAM_BOOLEAN("OutOfProcessHeapProfiling.UploadTrace.Success", +- success); +- +- if (!success) { +- LOG(ERROR) << "Cannot upload trace file: " << feedback; +- return; +- } +- +- // The reports is successfully sent. Reports the crash-id to ease debugging. +- LOG(WARNING) << "slow-reports sent: '" << feedback << '"'; +-} +- + void UploadTraceToCrashServer(std::string upload_url, + std::string file_contents, + std::string trigger_name, +@@ -89,16 +73,6 @@ void UploadTraceToCrashServer(std::strin + std::make_unique(); + metadata->SetKey("config", std::move(configs)); + metadata->SetKey(kConfigScenarioName, base::Value("MEMLOG")); +- +- TraceCrashServiceUploader* uploader = new TraceCrashServiceUploader( +- g_browser_process->shared_url_loader_factory()); +- if (!upload_url.empty()) +- uploader->SetUploadURL(upload_url); +- +- uploader->DoUpload(file_contents, content::TraceUploader::COMPRESSED_UPLOAD, +- std::move(metadata), +- content::TraceUploader::UploadProgressCallback(), +- base::Bind(&OnTraceUploadComplete, base::Owned(uploader))); + } + + } // namespace +--- a/components/heap_profiling/test_driver.cc ++++ b/components/heap_profiling/test_driver.cc +@@ -26,7 +26,6 @@ + #include "content/public/browser/browser_task_traits.h" + #include "content/public/browser/browser_thread.h" + #include "content/public/browser/render_process_host.h" +-#include "content/public/browser/tracing_controller.h" + #include "content/public/common/service_manager_connection.h" + + namespace heap_profiling { +--- a/components/heap_profiling/supervisor.cc ++++ b/components/heap_profiling/supervisor.cc +@@ -12,7 +12,6 @@ + #include "components/services/heap_profiling/public/cpp/settings.h" + #include "content/public/browser/browser_task_traits.h" + #include "content/public/browser/browser_thread.h" +-#include "content/public/browser/tracing_controller.h" + #include "content/public/common/service_manager_connection.h" + #include "services/resource_coordinator/public/cpp/memory_instrumentation/memory_instrumentation.h" + #include "services/service_manager/public/cpp/connector.h" +@@ -123,6 +122,9 @@ void Supervisor::RequestTraceWithHeapDum + DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); + DCHECK(HasStarted()); + ++ return; ++ ++ /* + if (content::TracingController::GetInstance()->IsTracing()) { + DLOG(ERROR) << "Requesting heap dump when tracing has already started."; + base::ThreadTaskRunnerHandle::Get()->PostTask( +@@ -173,6 +175,7 @@ void Supervisor::RequestTraceWithHeapDum + GetBackgroundTracingConfig(anonymize), + base::AdaptCallbackForRepeating(std::move(trigger_memory_dump_callback))); + DCHECK(result); ++ */ + } + + void Supervisor::StartServiceOnIOThread( +--- a/chrome/browser/ui/tab_helpers.cc ++++ b/chrome/browser/ui/tab_helpers.cc +@@ -54,7 +54,6 @@ + #include "chrome/browser/sync/sessions/sync_sessions_web_contents_router_factory.h" + #include "chrome/browser/tab_contents/navigation_metrics_recorder.h" + #include "chrome/browser/complex_tasks/task_tab_helper.h" +-#include "chrome/browser/tracing/navigation_tracing.h" + #include "chrome/browser/translate/chrome_translate_client.h" + #include "chrome/browser/ui/autofill/chrome_autofill_client.h" + #include "chrome/browser/ui/bloated_renderer/bloated_renderer_tab_helper.h" +@@ -88,7 +87,6 @@ + #include "components/offline_pages/buildflags/buildflags.h" + #include "components/password_manager/core/browser/password_manager.h" + #include "components/subresource_filter/core/browser/subresource_filter_features.h" +-#include "components/tracing/common/tracing_switches.h" + #include "components/ukm/content/source_url_recorder.h" + #include "content/public/browser/web_contents.h" + #include "extensions/buildflags/buildflags.h" +@@ -357,9 +355,6 @@ offline_pages::AutoFetchPageLoadWatcher: + if (predictors::LoadingPredictorFactory::GetForProfile(profile)) + predictors::LoadingPredictorTabHelper::CreateForWebContents(web_contents); + +- if (tracing::NavigationTracingObserver::IsEnabled()) +- tracing::NavigationTracingObserver::CreateForWebContents(web_contents); +- + if (MediaEngagementService::IsEnabled()) + MediaEngagementService::CreateWebContentsObserver(web_contents); + +--- a/content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc ++++ b/content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc +@@ -6,7 +6,6 @@ + + #include "base/metrics/histogram_functions.h" + #include "content/browser/renderer_host/pepper/pepper_message_filter.h" +-#include "content/browser/tracing/trace_message_filter.h" + #include "content/common/pepper_renderer_instance_data.h" + #include "content/public/common/process_type.h" + #include "ipc/ipc_message_macros.h" +@@ -39,7 +38,6 @@ BrowserPpapiHost* BrowserPpapiHost::Crea + new PepperMessageFilter()); + channel->AddFilter(pepper_message_filter->GetFilter()); + channel->AddFilter(browser_ppapi_host->message_filter().get()); +- channel->AddFilter((new TraceMessageFilter(render_process_id))->GetFilter()); + + return browser_ppapi_host; + } +--- a/content/public/app/content_packaged_services_manifest.cc ++++ b/content/public/app/content_packaged_services_manifest.cc +@@ -19,7 +19,6 @@ + #include "services/resource_coordinator/manifest.h" + #include "services/service_manager/public/cpp/manifest_builder.h" + #include "services/shape_detection/manifest.h" +-#include "services/tracing/manifest.h" + #include "services/video_capture/manifest.h" + #include "services/viz/manifest.h" + +@@ -64,7 +63,6 @@ const service_manager::Manifest& GetCont + .PackageService(network::GetManifest()) + .PackageService(resource_coordinator::GetManifest()) + .PackageService(shape_detection::GetManifest()) +- .PackageService(tracing::GetManifest()) + .PackageService(video_capture::GetManifest()) + .PackageService(viz::GetManifest()) + #if defined(OS_LINUX) +--- a/services/service_manager/public/cpp/service_binding.cc ++++ b/services/service_manager/public/cpp/service_binding.cc +@@ -10,8 +10,6 @@ + #include "base/no_destructor.h" + #include "base/synchronization/lock.h" + #include "services/service_manager/public/cpp/service.h" +-#include "services/tracing/public/cpp/traced_process.h" +-#include "services/tracing/public/mojom/tracing.mojom.h" + + namespace service_manager { + +@@ -168,12 +166,6 @@ void ServiceBinding::OnBindInterface( + return; + } + +- if (interface_name == tracing::mojom::TracedProcess::Name_) { +- tracing::TracedProcess::OnTracedProcessRequest( +- tracing::mojom::TracedProcessRequest(std::move(interface_pipe))); +- return; +- } +- + service_->OnBindInterface(source_info, interface_name, + std::move(interface_pipe)); + } +--- a/services/BUILD.gn ++++ b/services/BUILD.gn +@@ -36,7 +36,6 @@ test("services_unittests") { + "//services/proxy_resolver:tests", + "//services/resource_coordinator:tests", + "//services/shape_detection:tests", +- "//services/tracing:tests", + "//services/viz", + "//services/viz/privileged/interfaces:unit_tests", + "//services/viz/public/cpp/compositing:tests", +--- a/content/public/browser/BUILD.gn ++++ b/content/public/browser/BUILD.gn +@@ -362,7 +362,6 @@ jumbo_source_set("browser_sources") { + "//services/network/public/mojom", + "//services/resource_coordinator/public/cpp:resource_coordinator_cpp", + "//services/service_manager/public/cpp", +- "//services/tracing/public/cpp", + "//services/ws/public/mojom", + "//third_party/webrtc/modules/desktop_capture", + +--- a/services/service_manager/public/cpp/BUILD.gn ++++ b/services/service_manager/public/cpp/BUILD.gn +@@ -42,10 +42,6 @@ component("cpp") { + "//url", + ] + +- deps = [ +- "//services/tracing/public/cpp:traced_process", +- ] +- + defines = [ + "IS_SERVICE_MANAGER_CPP_IMPL", + +--- a/content/public/app/BUILD.gn ++++ b/content/public/app/BUILD.gn +@@ -235,7 +235,6 @@ source_set("content_packaged_services_ma + "//services/network:manifest", + "//services/resource_coordinator:manifest", + "//services/shape_detection:manifest", +- "//services/tracing:manifest", + "//services/video_capture:manifest", + "//services/viz:manifest", + ] +--- a/content/child/BUILD.gn ++++ b/content/child/BUILD.gn +@@ -110,7 +110,6 @@ target(link_target_type, "child") { + "//services/service_manager/public/cpp", + "//services/service_manager/public/mojom", + "//services/service_manager/runner/common", +- "//services/tracing/public/cpp", + "//skia", + "//storage/common", + "//third_party/blink/public:blink_headers", +--- a/content/browser/tracing/tracing_controller_impl.cc ++++ b/content/browser/tracing/tracing_controller_impl.cc +@@ -156,14 +156,9 @@ void TracingControllerImpl::AddAgents() + } + + void TracingControllerImpl::ConnectToServiceIfNeeded() { +- if (!coordinator_) { +- ServiceManagerConnection::GetForProcess()->GetConnector()->BindInterface( +- tracing::mojom::kServiceName, &coordinator_); +- } + } + + void TracingControllerImpl::DisconnectFromService() { +- coordinator_ = nullptr; + } + + // Can be called on any thread. +@@ -335,7 +330,6 @@ bool TracingControllerImpl::StartTracing + + start_tracing_done_ = std::move(callback); + ConnectToServiceIfNeeded(); +- coordinator_->StartTracing(trace_config.ToString()); + + if (start_tracing_done_ && + (base::trace_event::TraceLog::GetInstance()->IsEnabled() || +@@ -384,16 +378,8 @@ bool TracingControllerImpl::StopTracing( + new mojo::DataPipeDrainer(this, std::move(data_pipe.consumer_handle))); + if (agent_label.empty()) { + // Stop and flush all agents. +- coordinator_->StopAndFlush( +- std::move(data_pipe.producer_handle), +- base::BindRepeating(&TracingControllerImpl::OnMetadataAvailable, +- base::Unretained(this))); + } else { + // Stop all and flush a particular agent. +- coordinator_->StopAndFlushAgent( +- std::move(data_pipe.producer_handle), agent_label, +- base::BindRepeating(&TracingControllerImpl::OnMetadataAvailable, +- base::Unretained(this))); + } + // TODO(chiniforooshan): Is the return value used anywhere? + return true; +@@ -404,12 +390,6 @@ bool TracingControllerImpl::GetTraceBuff + DCHECK_CURRENTLY_ON(BrowserThread::UI); + + ConnectToServiceIfNeeded(); +- coordinator_->RequestBufferUsage(base::BindOnce( +- [](GetTraceBufferUsageCallback callback, bool success, float percent_full, +- uint32_t approximate_count) { +- std::move(callback).Run(percent_full, approximate_count); +- }, +- std::move(callback))); + // TODO(chiniforooshan): The actual success value should be sent by the + // callback asynchronously. + return true; diff --git a/patches/www-client/chromium-73.0.3683.75/unrar.patch b/patches/www-client/chromium-73.0.3683.75/unrar.patch new file mode 100644 index 0000000..21f8f1a --- /dev/null +++ b/patches/www-client/chromium-73.0.3683.75/unrar.patch @@ -0,0 +1,87 @@ +description: disable support for safe browsing inspection of rar files +author: Michael Gilbert +bug: http://bugs.debian.org/914487 + +--- a/chrome/common/safe_browsing/BUILD.gn ++++ b/chrome/common/safe_browsing/BUILD.gn +@@ -64,41 +64,6 @@ if (safe_browsing_mode == 1) { + ] + } + +- source_set("rar_analyzer") { +- sources = [ +- "rar_analyzer.cc", +- "rar_analyzer.h", +- ] +- +- deps = [ +- ":archive_analyzer_results", +- ":download_type_util", +- ":file_type_policies", +- "//base", +- "//base:i18n", +- "//components/safe_browsing:features", +- "//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("disk_image_type_sniffer_mac") { + sources = [ + "disk_image_type_sniffer_mac.cc", +@@ -167,7 +132,6 @@ source_set("safe_browsing") { + ":archive_analyzer_results", + ":binary_feature_extractor", + ":download_type_util", +- ":rar_analyzer", + "//components/safe_browsing:features", + ] + +--- a/chrome/services/file_util/safe_archive_analyzer.cc ++++ b/chrome/services/file_util/safe_archive_analyzer.cc +@@ -7,7 +7,6 @@ + #include "base/macros.h" + #include "build/build_config.h" + #include "chrome/common/safe_browsing/archive_analyzer_results.h" +-#include "chrome/common/safe_browsing/rar_analyzer.h" + #include "chrome/common/safe_browsing/zip_analyzer.h" + #include "mojo/public/cpp/bindings/strong_binding.h" + +@@ -50,8 +49,7 @@ void SafeArchiveAnalyzer::AnalyzeRarFile + AnalyzeRarFileCallback callback) { + DCHECK(rar_file.IsValid()); + ++ LOG(FATAL) << "AnalyzeRarFile is disabled in this build"; + safe_browsing::ArchiveAnalyzerResults results; +- safe_browsing::rar_analyzer::AnalyzeRarFile( +- std::move(rar_file), std::move(temporary_file), &results); + std::move(callback).Run(results); + } +--- a/chrome/browser/safe_browsing/download_protection/file_analyzer.cc ++++ b/chrome/browser/safe_browsing/download_protection/file_analyzer.cc +@@ -100,7 +100,7 @@ void FileAnalyzer::Start(const base::Fil + if (inspection_type == DownloadFileType::ZIP) { + StartExtractZipFeatures(); + } else if (inspection_type == DownloadFileType::RAR) { +- StartExtractRarFeatures(); ++ LOG(WARNING) << "Safebrowser inspection of rar files is disabled in this build"; + #if defined(OS_MACOSX) + } else if (inspection_type == DownloadFileType::DMG) { + StartExtractDmgFeatures(); diff --git a/patches/www-client/chromium-73.0.3683.75/welcome-page.patch b/patches/www-client/chromium-73.0.3683.75/welcome-page.patch new file mode 100644 index 0000000..07c9b99 --- /dev/null +++ b/patches/www-client/chromium-73.0.3683.75/welcome-page.patch @@ -0,0 +1,15 @@ +description: do not override the welcome page setting set in master_preferences +author: Michael Gilbert +bug-debian: http://bugs.debian.org/857767 + +--- a/chrome/browser/profiles/profile_manager.cc ++++ b/chrome/browser/profiles/profile_manager.cc +@@ -1075,7 +1075,7 @@ void ProfileManager::InitProfileUserPref + profile->GetPrefs()->SetString(prefs::kSupervisedUserId, + supervised_user_id); + } +-#if !defined(OS_ANDROID) ++#if 0 + // TODO(pmonette): Fix IsNewProfile() to handle the case where the profile is + // new even if the "Preferences" file already existed. (For example: The + // master_preferences file is dumped into the default profile on first run, -- cgit v1.2.1