test #1

build/patches/Always-use-new-tab-page-for-default-home-page.patch

@@ -10,7 +10,7 @@ Ignore any partner-provided home page.
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/homepage/HomepageManager.java
-@@ -152,9 +152,6 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat
+@@ -146,9 +146,6 @@ public class HomepageManager implements HomepagePolicyManager.HomepagePolicyStat
       *         if the homepage button is force enabled via flag.
       */
      public static String getDefaultHomepageUri() {

build/patches/Battery-API-return-nothing.patch

@@ -10,7 +10,7 @@ Include @thestinger's fix for correct charging/unknown values
 diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/third_party/blink/renderer/modules/battery/battery_manager.cc
 --- a/third_party/blink/renderer/modules/battery/battery_manager.cc
 +++ b/third_party/blink/renderer/modules/battery/battery_manager.cc
-@@ -45,46 +45,28 @@ ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) {
+@@ -69,46 +69,28 @@ ScriptPromise BatteryManager::StartRequest(ScriptState* script_state) {
  }
  
  bool BatteryManager::charging() {
@@ -37,7 +37,7 @@ diff --git a/third_party/blink/renderer/modules/battery/battery_manager.cc b/thi
    DCHECK(battery_property_);
  
 -  BatteryStatus old_status = battery_status_;
--  battery_status_ = *BatteryDispatcher::Instance().LatestData();
+-  battery_status_ = *battery_dispatcher_->LatestData();
 -
    if (battery_property_->GetState() == BatteryProperty::kPending) {
      battery_property_->Resolve(this);

build/patches/Change-default-webRTC-policy-to-not-use-any-address.patch

@@ -12,7 +12,7 @@ See also: https://github.com/bromite/bromite/issues/553
 diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc
 --- a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc
 +++ b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc
-@@ -423,12 +423,13 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
+@@ -461,12 +461,13 @@ PeerConnectionDependencyFactory::CreatePortAllocator(
            port_config.enable_nonproxied_udp = false;
            break;
          case DEFAULT:

build/patches/Disable-all-promo-dialogs.patch

@@ -9,16 +9,16 @@ Subject: Disable all promo dialogs
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
-@@ -475,7 +475,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+@@ -491,7 +491,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
       * displayed.
       */
      private boolean triggerPromo(boolean intentWithEffect) {
 -        try (TraceEvent e = TraceEvent.scoped("TabbedRootUiCoordinator.triggerPromo")) {
 +        /*try (TraceEvent e = TraceEvent.scoped("TabbedRootUiCoordinator.triggerPromo")) {
-             SharedPreferencesManager preferenceManager = SharedPreferencesManager.getInstance();
-             // Promos can only be shown when we start with ACTION_MAIN intent and
-             // after FRE is complete. Native initialization can finish before the FRE flow is
-@@ -506,8 +506,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
+             if (CommandLine.getInstance().hasSwitch(ChromeSwitches.DISABLE_STARTUP_PROMOS)) {
+                 return false;
+             }
+@@ -526,8 +526,8 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
                  preferenceManager.writeBoolean(
                          ChromePreferenceKeys.PROMOS_SKIPPED_ON_FIRST_START, true);
              }

build/patches/Disable-omission-of-URL-elements-in-Omnibox.patch

@@ -11,7 +11,7 @@ a corresponding user option to individually disable their usage.
 diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc
 --- a/components/url_formatter/url_formatter.cc
 +++ b/components/url_formatter/url_formatter.cc
-@@ -469,13 +469,13 @@ ComponentResult IDNToUnicodeOneComponent(
+@@ -471,13 +471,13 @@ ComponentResult IDNToUnicodeOneComponent(
  }  // namespace
  
  const FormatUrlType kFormatUrlOmitNothing = 0;

build/patches/Disable-references-to-fonts.googleapis.com.patch

@@ -12,7 +12,7 @@ Subject: Disable references to fonts.googleapis.com
 diff --git a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
 --- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
 +++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
-@@ -292,7 +292,7 @@ bool DomDistillerViewerSource::ShouldServiceRequest(
+@@ -295,7 +295,7 @@ bool DomDistillerViewerSource::ShouldServiceRequest(
  std::string DomDistillerViewerSource::GetContentSecurityPolicy(
      network::mojom::CSPDirectiveName directive) {
    if (directive == network::mojom::CSPDirectiveName::StyleSrc) {

build/patches/Disable-sync-services-menu-entry.patch

@@ -3,10 +3,10 @@ Date: Mon, 11 Nov 2019 23:09:48 +0100
 Subject: Disable sync services menu entry
 
 ---
- .../android/java/res/xml/main_preferences.xml   | 11 ++---------
- .../java/res/xml/privacy_preferences.xml        |  5 -----
- .../sync/settings/SyncSettingsUtils.java        | 17 -----------------
- 3 files changed, 2 insertions(+), 31 deletions(-)
+ chrome/android/java/res/xml/main_preferences.xml      | 11 ++---------
+ chrome/android/java/res/xml/privacy_preferences.xml   |  5 -----
+ .../browser/sync/settings/SyncSettingsUtils.java      |  3 +++
+ 3 files changed, 5 insertions(+), 14 deletions(-)
 
 diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
 --- a/chrome/android/java/res/xml/main_preferences.xml
@@ -39,43 +39,29 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -34,9 +34,4 @@
-         android:summary="@string/clear_browsing_data_summary"
-         android:fragment="org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTabsFragment"
-         android:order="5"/>
+@@ -39,9 +39,4 @@
+         android:title="@string/prefs_privacy_sandbox"
+         android:fragment="org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxSettingsFragment"
+         android:order="7"/>
 -    <org.chromium.components.browser_ui.settings.TextMessagePreference
 -        android:key="sync_and_services_link"
 -        android:summary="@string/privacy_sync_and_services_link_legacy"
 -        app:allowDividerBelow="false"
--        android:order="7"/>
+-        android:order="8"/>
  </PreferenceScreen>
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java
-@@ -257,23 +257,6 @@ public class SyncSettingsUtils {
-         }
- 
-         boolean syncEnabled = AndroidSyncSettings.get().isSyncEnabled();
--        if (syncEnabled) {
--            if (!profileSyncService.isSyncActive()) {
--                return res.getString(R.string.sync_setup_progress);
--            }
--
--            if (profileSyncService.isPassphraseRequiredForPreferredDataTypes()) {
--                return res.getString(R.string.sync_need_passphrase);
--            }
--
--            if (profileSyncService.isTrustedVaultKeyRequiredForPreferredDataTypes()) {
--                return profileSyncService.isEncryptEverythingEnabled()
--                        ? context.getString(R.string.sync_error_card_title)
--                        : context.getString(R.string.sync_passwords_error_card_title);
--            }
--
--            return context.getString(R.string.sync_and_services_summary_sync_on);
--        }
-         return context.getString(R.string.sync_is_disabled);
-     }
+@@ -209,6 +209,9 @@ public class SyncSettingsUtils {
+     public static String getSyncStatusSummary(Context context) {
+         Resources res = context.getResources();
  
++        if (true) {
++            return res.getString(R.string.sync_is_disabled);
++        }
+         if (!IdentityServicesProvider.get()
+                         .getIdentityManager(Profile.getLastUsedRegularProfile())
+                         .hasPrimaryAccount()) {
 -- 
 2.17.1
 

build/patches/Disable-third-party-cookies-by-default.patch

@@ -4,13 +4,15 @@ Subject: Disable third-party cookies by default
 
 author: Chad Miller <chad.miller@canonical.com>
 ---
- chrome/browser/prefs/browser_prefs.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ chrome/browser/prefs/browser_prefs.cc              | 2 +-
+ third_party/ots/src/subprojects/google-brotli.wrap | 8 ++++++++
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+ create mode 100644 third_party/ots/src/subprojects/google-brotli.wrap
 
 diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
 --- a/chrome/browser/prefs/browser_prefs.cc
 +++ b/chrome/browser/prefs/browser_prefs.cc
-@@ -549,7 +549,7 @@ void RegisterProfilePrefsForMigration(
+@@ -591,7 +591,7 @@ void RegisterProfilePrefsForMigration(
  
    registry->RegisterDictionaryPref(kObservedSessionTime);
  
@@ -19,6 +21,19 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
  
    registry->RegisterTimePref(kPluginsDeprecationInfobarLastShown, base::Time());
  
+diff --git a/third_party/ots/src/subprojects/google-brotli.wrap b/third_party/ots/src/subprojects/google-brotli.wrap
+new file mode 100644
+--- /dev/null
++++ b/third_party/ots/src/subprojects/google-brotli.wrap
+@@ -0,0 +1,8 @@
++[wrap-file]
++directory = brotli-1.0.7
++
++source_url = https://github.com/google/brotli/archive/v1.0.7.tar.gz
++source_filename = v1.0.7.tar.gz
++source_hash = 4c61bfb0faca87219ea587326c467b95acb25555b53d1a421ffa3c8a9296ee2c
++
++patch_directory = brotli
 -- 
 2.17.1
 

build/patches/Do-not-hide-component-extensions.patch

@@ -9,7 +9,7 @@ Subject: Do not hide component extensions
 diff --git a/extensions/common/extension.cc b/extensions/common/extension.cc
 --- a/extensions/common/extension.cc
 +++ b/extensions/common/extension.cc
-@@ -378,9 +378,8 @@ bool Extension::ShouldDisplayInNewTabPage() const {
+@@ -380,9 +380,8 @@ bool Extension::ShouldDisplayInNewTabPage() const {
  }
  
  bool Extension::ShouldExposeViaManagementAPI() const {

build/patches/Hide-send-reports-checkbox.patch

@@ -16,8 +16,8 @@ diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/j
 -                        android:textAppearance="@style/TextAppearance.TextMedium.Primary" />
 +                        android:textAppearance="@style/TextAppearance.TextMedium.Primary" android:visibility="gone" />
                  </LinearLayout>
-             </LinearLayout>
-         </LinearLayout>
+ 
+                 <include
 -- 
 2.17.1
 

build/patches/Modify-default-preferences.patch

@@ -20,7 +20,7 @@ Subject: Modify default preferences
 diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc
 --- a/chrome/browser/background/background_mode_manager.cc
 +++ b/chrome/browser/background/background_mode_manager.cc
-@@ -340,7 +340,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
+@@ -360,7 +360,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
    registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false);
    registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false);
  #endif
@@ -32,7 +32,7 @@ diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/brows
 diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -1328,7 +1328,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
+@@ -1363,7 +1363,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
  void ChromeContentBrowserClient::RegisterProfilePrefs(
      user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -68,7 +68,7 @@ diff --git a/chrome/browser/net/prediction_options.h b/chrome/browser/net/predic
 diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
 --- a/chrome/browser/profiles/profile.cc
 +++ b/chrome/browser/profiles/profile.cc
-@@ -277,7 +277,7 @@ const char Profile::kProfileKey[] = "__PROFILE__";
+@@ -248,7 +248,7 @@ const char Profile::kProfileKey[] = "__PROFILE__";
  void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
        prefs::kSearchSuggestEnabled,
@@ -121,7 +121,7 @@ diff --git a/chrome/service/cloud_print/connector_settings.cc b/chrome/service/c
 diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
 --- a/components/autofill/core/browser/autofill_manager.cc
 +++ b/components/autofill/core/browser/autofill_manager.cc
-@@ -964,10 +964,7 @@ void AutofillManager::OnQueryFormFieldAutofillImpl(
+@@ -990,10 +990,7 @@ void AutofillManager::OnQueryFormFieldAutofillImpl(
        // suggestions available.
        // TODO(mathp): Differentiate between number of suggestions available
        // (current metric) and number shown to the user.
@@ -133,9 +133,9 @@ diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/a
      }
    }
  
-@@ -1600,8 +1597,8 @@ void AutofillManager::Reset() {
-   credit_card_access_manager_.reset(new CreditCardAccessManager(
-       driver(), client_, personal_data_, credit_card_form_event_logger_.get()));
+@@ -1576,8 +1573,8 @@ void AutofillManager::Reset() {
+   credit_card_access_manager_ = std::make_unique<CreditCardAccessManager>(
+       driver(), client_, personal_data_, credit_card_form_event_logger_.get());
  
 -  has_logged_autofill_enabled_ = false;
 -  has_logged_address_suggestions_count_ = false;
@@ -177,7 +177,7 @@ diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmar
 diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/components/safe_browsing/core/common/safe_browsing_prefs.cc
 --- a/components/safe_browsing/core/common/safe_browsing_prefs.cc
 +++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc
-@@ -190,9 +190,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
+@@ -192,9 +192,9 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
    registry->RegisterBooleanPref(
        prefs::kSafeBrowsingSawInterstitialScoutReporting, false);
    registry->RegisterBooleanPref(

build/patches/Never-send-any-crash-upload-data.patch

@@ -9,7 +9,7 @@ Subject: Never send any crash upload data
 diff --git a/chrome/browser/tracing/crash_service_uploader.cc b/chrome/browser/tracing/crash_service_uploader.cc
 --- a/chrome/browser/tracing/crash_service_uploader.cc
 +++ b/chrome/browser/tracing/crash_service_uploader.cc
-@@ -126,14 +126,16 @@ void TraceCrashServiceUploader::DoUpload(
+@@ -127,14 +127,16 @@ void TraceCrashServiceUploader::DoUpload(
      UploadDoneCallback done_callback) {
    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
  

build/patches/Password-service-build-fixes.patch

@@ -3,18 +3,20 @@ Date: Wed, 23 Sep 2020 14:47:44 +0200
 Subject: Password service build fixes
 
 ---
- .../password_manager/chrome_password_manager_client.cc       | 2 ++
- .../safe_browsing/chrome_password_protection_service.h       | 2 --
- .../password_manager/core/browser/password_manager_client.h  | 2 ++
- .../core/browser/password_reuse_detection_manager.cc         | 2 ++
- .../password_protection/password_protection_request.cc       | 2 --
- .../password_protection/password_protection_service.h        | 5 -----
- 6 files changed, 6 insertions(+), 9 deletions(-)
+ .../chrome_password_manager_client.cc         |  2 ++
+ .../chrome_password_manager_client.h          | 10 ++++++++--
+ .../chrome_password_protection_service.cc     | 20 -------------------
+ .../chrome_password_protection_service.h      |  2 --
+ .../core/browser/password_manager_client.h    |  4 ++++
+ .../password_reuse_detection_manager.cc       |  2 ++
+ .../password_protection_request.cc            |  2 --
+ .../password_protection_service.h             |  5 -----
+ 8 files changed, 16 insertions(+), 31 deletions(-)
 
 diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc
 --- a/chrome/browser/password_manager/chrome_password_manager_client.cc
 +++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
-@@ -462,7 +462,9 @@ void ChromePasswordManagerClient::ShowTouchToFill(
+@@ -471,7 +471,9 @@ void ChromePasswordManagerClient::ShowTouchToFill(
  #if defined(OS_ANDROID)
  void ChromePasswordManagerClient::OnPasswordSelected(
      const base::string16& text) {
@@ -24,10 +26,68 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b
  }
  #endif
  
+diff --git a/chrome/browser/password_manager/chrome_password_manager_client.h b/chrome/browser/password_manager/chrome_password_manager_client.h
+--- a/chrome/browser/password_manager/chrome_password_manager_client.h
++++ b/chrome/browser/password_manager/chrome_password_manager_client.h
+@@ -190,8 +190,14 @@ class ChromePasswordManagerClient
+   void AnnotateNavigationEntry(bool has_password_field) override;
+   autofill::LanguageCode GetPageLanguage() const override;
+ 
++#if defined(PASSWORD_REUSE_DETECTION_ENABLED)
++#define PASSWORD_REUSE_DETECTION_ENABLED_OVERRIDE override
++#else
++#define PASSWORD_REUSE_DETECTION_ENABLED_OVERRIDE
++#endif
++
+   safe_browsing::PasswordProtectionService* GetPasswordProtectionService()
+-      const override;
++      const PASSWORD_REUSE_DETECTION_ENABLED_OVERRIDE;
+ 
+ #if defined(ON_FOCUS_PING_ENABLED)
+   void CheckSafeBrowsingReputation(const GURL& form_action,
+@@ -203,7 +209,7 @@ class ChromePasswordManagerClient
+       const std::string& username,
+       const std::vector<password_manager::MatchingReusedCredential>&
+           matching_reused_credentials,
+-      bool password_field_exists) override;
++      bool password_field_exists) PASSWORD_REUSE_DETECTION_ENABLED_OVERRIDE;
+ 
+   void LogPasswordReuseDetectedEvent() override;
+ 
+diff --git a/chrome/browser/safe_browsing/chrome_password_protection_service.cc b/chrome/browser/safe_browsing/chrome_password_protection_service.cc
+--- a/chrome/browser/safe_browsing/chrome_password_protection_service.cc
++++ b/chrome/browser/safe_browsing/chrome_password_protection_service.cc
+@@ -353,26 +353,6 @@ bool ChromePasswordProtectionService::ShouldShowPasswordReusePageInfoBubble(
+              : false;
+ }
+ 
+-safe_browsing::LoginReputationClientRequest::UrlDisplayExperiment
+-ChromePasswordProtectionService::GetUrlDisplayExperiment() const {
+-  safe_browsing::LoginReputationClientRequest::UrlDisplayExperiment experiment;
+-  experiment.set_simplified_url_display_enabled(
+-      base::FeatureList::IsEnabled(safe_browsing::kSimplifiedUrlDisplay));
+-  // Delayed warnings parameters:
+-  experiment.set_delayed_warnings_enabled(
+-      base::FeatureList::IsEnabled(safe_browsing::kDelayedWarnings));
+-  experiment.set_delayed_warnings_mouse_clicks_enabled(
+-      safe_browsing::kDelayedWarningsEnableMouseClicks.Get());
+-  // Actual URL display experiments:
+-  experiment.set_reveal_on_hover(base::FeatureList::IsEnabled(
+-      omnibox::kRevealSteadyStateUrlPathQueryAndRefOnHover));
+-  experiment.set_hide_on_interaction(base::FeatureList::IsEnabled(
+-      omnibox::kHideSteadyStateUrlPathQueryAndRefOnInteraction));
+-  experiment.set_elide_to_registrable_domain(
+-      base::FeatureList::IsEnabled(omnibox::kMaybeElideToRegistrableDomain));
+-  return experiment;
+-}
+-
+ void ChromePasswordProtectionService::ShowModalWarning(
+     content::WebContents* web_contents,
+     RequestOutcome outcome,
 diff --git a/chrome/browser/safe_browsing/chrome_password_protection_service.h b/chrome/browser/safe_browsing/chrome_password_protection_service.h
 --- a/chrome/browser/safe_browsing/chrome_password_protection_service.h
 +++ b/chrome/browser/safe_browsing/chrome_password_protection_service.h
-@@ -255,8 +255,6 @@ class ChromePasswordProtectionService : public PasswordProtectionService {
+@@ -256,8 +256,6 @@ class ChromePasswordProtectionService : public PasswordProtectionService {
    // |NOT_SIGNED_IN|.
    LoginReputationClientRequest::PasswordReuseEvent::SyncAccountType
    GetSyncAccountType() const override;
@@ -39,26 +99,38 @@ diff --git a/chrome/browser/safe_browsing/chrome_password_protection_service.h b
 diff --git a/components/password_manager/core/browser/password_manager_client.h b/components/password_manager/core/browser/password_manager_client.h
 --- a/components/password_manager/core/browser/password_manager_client.h
 +++ b/components/password_manager/core/browser/password_manager_client.h
-@@ -325,6 +325,7 @@ class PasswordManagerClient {
+@@ -330,9 +330,11 @@ class PasswordManagerClient {
    // Returns the current best guess as to the page's display language.
-   virtual std::string GetPageLanguage() const;
+   virtual autofill::LanguageCode GetPageLanguage() const;
  
 +#if defined(PASSWORD_REUSE_DETECTION_ENABLED)
    // Return the PasswordProtectionService associated with this instance.
    virtual safe_browsing::PasswordProtectionService*
    GetPasswordProtectionService() const = 0;
-@@ -349,6 +350,7 @@ class PasswordManagerClient {
++#endif
+ 
+ #if defined(ON_FOCUS_PING_ENABLED)
+   // Checks the safe browsing reputation of the webpage when the
+@@ -342,6 +344,7 @@ class PasswordManagerClient {
+                                            const GURL& frame_url) = 0;
+ #endif
+ 
++#if defined(PASSWORD_REUSE_DETECTION_ENABLED)
+   // Checks the safe browsing reputation of the webpage where password reuse
+   // happens. This is called by the PasswordReuseDetectionManager when a
+   // protected password is typed on the wrong domain. This may trigger a
+@@ -354,6 +357,7 @@ class PasswordManagerClient {
        const std::string& username,
        const std::vector<MatchingReusedCredential>& matching_reused_credentials,
        bool password_field_exists) = 0;
 +#endif
  
- #if defined(PASSWORD_REUSE_WARNING_ENABLED)
    // Records a Chrome Sync event that GAIA password reuse was detected.
+   virtual void LogPasswordReuseDetectedEvent() = 0;
 diff --git a/components/password_manager/core/browser/password_reuse_detection_manager.cc b/components/password_manager/core/browser/password_reuse_detection_manager.cc
 --- a/components/password_manager/core/browser/password_reuse_detection_manager.cc
 +++ b/components/password_manager/core/browser/password_reuse_detection_manager.cc
-@@ -172,10 +172,12 @@ void PasswordReuseDetectionManager::OnReuseCheckDone(
+@@ -170,10 +170,12 @@ void PasswordReuseDetectionManager::OnReuseCheckDone(
                               ? reused_protected_password_hash->username
                               : "";
  
@@ -74,19 +146,19 @@ diff --git a/components/password_manager/core/browser/password_reuse_detection_m
 diff --git a/components/safe_browsing/content/password_protection/password_protection_request.cc b/components/safe_browsing/content/password_protection/password_protection_request.cc
 --- a/components/safe_browsing/content/password_protection/password_protection_request.cc
 +++ b/components/safe_browsing/content/password_protection/password_protection_request.cc
-@@ -133,8 +133,6 @@ PasswordProtectionRequest::PasswordProtectionRequest(
+@@ -137,8 +137,6 @@ PasswordProtectionRequest::PasswordProtectionRequest(
           password_type_ != PasswordType::SAVED_PASSWORD ||
           !matching_reused_credentials_.empty());
    request_proto_->set_trigger_type(trigger_type_);
 -  *request_proto_->mutable_url_display_experiment() =
 -      pps->GetUrlDisplayExperiment();
- }
  
- PasswordProtectionRequest::~PasswordProtectionRequest() {
+   request_canceler_ =
+       RequestCanceler::CreateRequestCanceler(GetWeakPtr(), web_contents);
 diff --git a/components/safe_browsing/content/password_protection/password_protection_service.h b/components/safe_browsing/content/password_protection/password_protection_service.h
 --- a/components/safe_browsing/content/password_protection/password_protection_service.h
 +++ b/components/safe_browsing/content/password_protection/password_protection_service.h
-@@ -423,11 +423,6 @@ class PasswordProtectionService : public history::HistoryServiceObserver {
+@@ -411,11 +411,6 @@ class PasswordProtectionServiceBase : public history::HistoryServiceObserver {
    virtual LoginReputationClientRequest::PasswordReuseEvent::SyncAccountType
    GetSyncAccountType() const = 0;
  

build/patches/Restore-classic-new-tab-page.patch

@@ -58,7 +58,7 @@ diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
  // Used to look up the URL to use for the New Tab page. Also tracks how we
  // arrived at that URL so it can be logged with UMA.
  struct NewTabURLDetails {
-@@ -187,10 +152,9 @@ struct NewTabURLDetails {
+@@ -188,10 +153,9 @@ struct NewTabURLDetails {
                               : chrome::kChromeSearchLocalNtpUrl);
  #endif
  
@@ -71,7 +71,7 @@ diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc
          GetDefaultSearchProviderTemplateURL(profile);
      if (!profile || !template_url)
        return NewTabURLDetails(local_url, NEW_TAB_URL_BAD);
-@@ -206,7 +170,7 @@ struct NewTabURLDetails {
+@@ -207,7 +171,7 @@ struct NewTabURLDetails {
      if (!IsURLAllowedForSupervisedUser(search_provider_url, profile))
        return NewTabURLDetails(local_url, NEW_TAB_URL_BLOCKED);
  

build/patches/Skip-the-first-run-and-metrics.patch

@@ -11,7 +11,7 @@ Subject: Skip the first run and metrics
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
-@@ -61,12 +61,11 @@ public class FirstRunStatus {
+@@ -41,12 +41,11 @@ public class FirstRunStatus {
       * includes ToS and Sign In pages if necessary.
       */
      public static boolean getFirstRunFlowComplete() {
@@ -32,7 +32,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
-@@ -37,15 +37,12 @@ public class FirstRunUtils {
+@@ -42,15 +42,12 @@ public class FirstRunUtils {
          boolean javaPrefValue =
                  javaPrefs.readBoolean(ChromePreferenceKeys.FIRST_RUN_CACHED_TOS_ACCEPTED, false);
          boolean nativePrefValue = isFirstRunEulaAccepted();
@@ -51,9 +51,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
-@@ -80,13 +80,6 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
-             }
-         });
+@@ -87,13 +87,6 @@ public class ToSAndUMAFirstRunFragment extends Fragment implements FirstRunFragm
+ 
+         mAcceptButton.setOnClickListener((v) -> onTosButtonClicked());
  
 -        mSendReportCheckBox.setChecked(FirstRunActivity.DEFAULT_METRICS_AND_CRASH_REPORTING);
 -        if (!canShowUmaCheckBox()) {

build/patches/battery_status_service-disable-more-privacy-nightmares.patch

@@ -24,7 +24,7 @@ References: https://github.com/iridium-browser/iridium-browser/issues/40
 diff --git a/services/device/battery/battery_status_service.cc b/services/device/battery/battery_status_service.cc
 --- a/services/device/battery/battery_status_service.cc
 +++ b/services/device/battery/battery_status_service.cc
-@@ -43,6 +43,7 @@ BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) {
+@@ -43,6 +43,7 @@ base::CallbackListSubscription BatteryStatusService::AddCallback(
    if (!battery_fetcher_)
      battery_fetcher_ = BatteryStatusManager::Create(update_callback_);
  
@@ -32,7 +32,7 @@ diff --git a/services/device/battery/battery_status_service.cc b/services/device
    if (callback_list_.empty()) {
      bool success = battery_fetcher_->StartListeningBatteryChange();
      // On failure pass the default values back.
-@@ -54,6 +55,7 @@ BatteryStatusService::AddCallback(const BatteryUpdateCallback& callback) {
+@@ -54,6 +55,7 @@ base::CallbackListSubscription BatteryStatusService::AddCallback(
      // Send recent status to the new callback if already available.
      callback.Run(status_);
    }

build/patches/ungoogled-chromium-Disable-Google-host-detection.patch

@@ -336,7 +336,7 @@ diff --git a/components/page_load_metrics/common/page_load_metrics_util.cc b/com
 diff --git a/components/search_engines/template_url.cc b/components/search_engines/template_url.cc
 --- a/components/search_engines/template_url.cc
 +++ b/components/search_engines/template_url.cc
-@@ -513,11 +513,7 @@ base::string16 TemplateURLRef::SearchTermToString16(
+@@ -526,11 +526,7 @@ base::string16 TemplateURLRef::SearchTermToString16(
  bool TemplateURLRef::HasGoogleBaseURLs(
      const SearchTermsData& search_terms_data) const {
    ParseIfNecessary(search_terms_data);
@@ -352,7 +352,7 @@ diff --git a/components/search_engines/template_url.cc b/components/search_engin
 diff --git a/net/base/url_util.cc b/net/base/url_util.cc
 --- a/net/base/url_util.cc
 +++ b/net/base/url_util.cc
-@@ -415,27 +415,6 @@ bool HasGoogleHost(const GURL& url) {
+@@ -430,27 +430,6 @@ bool HasGoogleHost(const GURL& url) {
  }
  
  bool IsGoogleHost(base::StringPiece host) {

build/patches/ungoogled-chromium-Disable-Network-Time-Tracker.patch

@@ -13,7 +13,7 @@ Fixes https://github.com/Eloston/ungoogled-chromium/issues/302
 diff --git a/components/network_time/network_time_tracker.cc b/components/network_time/network_time_tracker.cc
 --- a/components/network_time/network_time_tracker.cc
 +++ b/components/network_time/network_time_tracker.cc
-@@ -276,7 +276,7 @@ void NetworkTimeTracker::UpdateNetworkTime(base::Time network_time,
+@@ -277,7 +277,7 @@ void NetworkTimeTracker::UpdateNetworkTime(base::Time network_time,
  }
  
  bool NetworkTimeTracker::AreTimeFetchesEnabled() const {

build/patches/ungoogled-chromium-Disable-domain-reliability.patch

@@ -755,7 +755,7 @@ diff --git a/components/domain_reliability/google_configs.h b/components/domain_
 diff --git a/components/domain_reliability/uploader.cc b/components/domain_reliability/uploader.cc
 --- a/components/domain_reliability/uploader.cc
 +++ b/components/domain_reliability/uploader.cc
-@@ -77,7 +77,7 @@ class DomainReliabilityUploaderImpl : public DomainReliabilityUploader,
+@@ -79,7 +79,7 @@ class DomainReliabilityUploaderImpl : public DomainReliabilityUploader,
      if (discard_uploads_)
        discarded_upload_count_++;
  

build/patches/ungoogled-chromium-Disable-profile-avatar.patch

@@ -12,7 +12,7 @@ Added some Bromite-specific further improvements
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -1423,8 +1423,6 @@ static_library("browser") {
+@@ -1455,8 +1455,6 @@ static_library("browser") {
      "profiles/profile_attributes_entry.h",
      "profiles/profile_attributes_storage.cc",
      "profiles/profile_attributes_storage.h",
@@ -24,7 +24,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
 diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browser/profiles/profile_attributes_entry.cc
 --- a/chrome/browser/profiles/profile_attributes_entry.cc
 +++ b/chrome/browser/profiles/profile_attributes_entry.cc
-@@ -285,12 +285,6 @@ base::string16 ProfileAttributesEntry::GetUserName() const {
+@@ -286,12 +286,6 @@ base::string16 ProfileAttributesEntry::GetUserName() const {
  gfx::Image ProfileAttributesEntry::GetAvatarIcon(
      int size_for_placeholder_avatar,
      bool use_high_res_file) const {

build/patches/ungoogled-chromium-Disable-translate-integration.patch

@@ -4,25 +4,38 @@ Subject: ungoogled-chromium: Disable translate integration
 
 Remove translate offer
 ---
- .../xml/languages_detailed_preferences.xml    |  5 ---
- .../java/res/xml/languages_preferences.xml    |  5 ---
- .../language/settings/LanguageSettings.java   | 43 -------------------
- .../strings/android_chrome_strings.grd        |  3 --
- .../core/browser/translate_manager.cc         |  5 ++-
- .../core/browser/translate_script.cc          | 19 +++-----
- 6 files changed, 9 insertions(+), 71 deletions(-)
+ .../xml/languages_detailed_preferences.xml    | 18 -----
+ .../java/res/xml/languages_preferences.xml    |  5 --
+ .../language/settings/LanguageSettings.java   | 80 +------------------
+ .../strings/android_chrome_strings.grd        |  3 -
+ .../core/browser/translate_manager.cc         |  5 +-
+ .../core/browser/translate_script.cc          | 19 ++---
+ 6 files changed, 11 insertions(+), 119 deletions(-)
 
 diff --git a/chrome/android/java/res/xml/languages_detailed_preferences.xml b/chrome/android/java/res/xml/languages_detailed_preferences.xml
 --- a/chrome/android/java/res/xml/languages_detailed_preferences.xml
 +++ b/chrome/android/java/res/xml/languages_detailed_preferences.xml
-@@ -11,9 +11,4 @@
-         android:layout="@layout/languages_preference"
-         android:widgetLayout="@layout/accept_languages_list" />
+@@ -29,22 +29,4 @@
  
--    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
--        android:key="translate_switch"
--        android:summaryOn="@string/languages_offer_translate_switch"
--        android:summaryOff="@string/languages_offer_translate_switch" />
+     </PreferenceCategory>
+ 
+-    <PreferenceCategory
+-        android:key="translation_settings_section"
+-        android:order="3"
+-        android:title="@string/languages_settings_title"
+-        app:initialExpandedChildrenCount="1">
+-
+-        <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+-            android:key="translate_switch"
+-            android:summaryOn="@string/languages_send_translate_switch"
+-            android:summaryOff="@string/languages_send_translate_switch" />
+-
+-        <org.chromium.chrome.browser.language.settings.LanguageItemPickerPreference
+-            android:key="translate_settings_target_language"
+-            android:title="@string/languages_settings_target"
+-            app:allowDividerBelow="false" />
+-
+-    </PreferenceCategory>
 -
  </PreferenceScreen>
 diff --git a/chrome/android/java/res/xml/languages_preferences.xml b/chrome/android/java/res/xml/languages_preferences.xml
@@ -41,17 +54,27 @@ diff --git a/chrome/android/java/res/xml/languages_preferences.xml b/chrome/andr
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java
-@@ -34,7 +34,6 @@ public class LanguageSettings
- 
+@@ -42,15 +42,9 @@ public class LanguageSettings
      // The keys for each preference shown on the languages page.
-     static final String PREFERRED_LANGUAGES_KEY = "preferred_languages";
+     static final String APP_LANGUAGE_SECTION_KEY = "app_language_section";
+     static final String APP_LANGUAGE_PREFERENCE_KEY = "app_language_preference";
+-    static final String PREFERRED_LANGUAGES_KEY = "preferred_languages";
++    
+     static final String CONTENT_LANGUAGES_KEY = "content_languages_preference";
 -    static final String TRANSLATE_SWITCH_KEY = "translate_switch";
+-
+-    static final String TRANSLATION_SETTINGS_SECTION = "translation_settings_section";
+-    static final String TARGET_LANGUAGE_KEY = "translate_settings_target_language";
+-    static final String AUTOMATIC_LANGUAGES_KEY = "translate_settings_automatic_languages";
+-    static final String NO_PROMPT_LANGUAGES_KEY = "translate_settings_no_prompt_languages";
+-    static final String NO_PROMPT_SITES_KEY = "translate_settings_no_prompt_sites";
++    static final String PREFERRED_LANGUAGES_KEY = "preferred_languages";
  
      @Override
      public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-@@ -57,27 +56,6 @@ public class LanguageSettings
-                 (DetailedLanguageListPreference) findPreference(PREFERRED_LANGUAGES_KEY);
- 
+@@ -75,27 +69,6 @@ public class LanguageSettings
+         LanguageListPreference mLanguageListPref =
+                 (LanguageListPreference) findPreference(PREFERRED_LANGUAGES_KEY);
          mLanguageListPref.registerActivityLauncher(this);
 -
 -        ChromeSwitchPreference translateSwitch =
@@ -76,23 +99,38 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/language/settin
 -                -> getPrefService().isManagedPreference(Pref.OFFER_TRANSLATE_ENABLED));
      }
  
-     public void createBasicPreferences(Bundle savedInstanceState, String rootKey) {
-@@ -87,27 +65,6 @@ public class LanguageSettings
-                 (LanguageListPreference) findPreference(PREFERRED_LANGUAGES_KEY);
- 
-         mLanguageListPref.registerActivityLauncher(this);
--
+     /**
+@@ -139,48 +112,6 @@ public class LanguageSettings
+      * @param languageListPreference LanguageListPreference reference to update about state changes.
+      */
+     private void setupTranslateSection(LanguageListPreference languageListPreference) {
 -        ChromeSwitchPreference translateSwitch =
 -                (ChromeSwitchPreference) findPreference(TRANSLATE_SWITCH_KEY);
 -        boolean isTranslateEnabled = getPrefService().getBoolean(Pref.OFFER_TRANSLATE_ENABLED);
 -        translateSwitch.setChecked(isTranslateEnabled);
 -
+-        PreferenceCategory translationSettingsSection =
+-                (PreferenceCategory) findPreference(TRANSLATION_SETTINGS_SECTION);
+-        translationSettingsSection.setOnExpandButtonClickListener(
+-                new PreferenceGroup.OnExpandButtonClickListener() {
+-                    @Override
+-                    public void onExpandButtonClick() {
+-                        LanguagesManager.recordImpression(LanguagesManager.LanguageSettingsPageType
+-                                                                  .ADVANCED_LANGUAGE_SETTINGS);
+-                    }
+-                });
+-
+-        // Get advanced section preference items
+-        LanguageItemPickerPreference targetLanguagePreference =
+-                (LanguageItemPickerPreference) findPreference(TARGET_LANGUAGE_KEY);
+-
 -        translateSwitch.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
 -            @Override
 -            public boolean onPreferenceChange(Preference preference, Object newValue) {
 -                boolean enabled = (boolean) newValue;
 -                getPrefService().setBoolean(Pref.OFFER_TRANSLATE_ENABLED, enabled);
--                mLanguageListPref.notifyPrefChanged();
+-                languageListPreference.notifyPrefChanged();
+-                targetLanguagePreference.setVisible(enabled);
 -                LanguagesManager.recordAction(enabled ? LanguagesManager.LanguageSettingsActionType
 -                                                                .ENABLE_TRANSLATE_GLOBALLY
 -                                                      : LanguagesManager.LanguageSettingsActionType
@@ -102,13 +140,33 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/language/settin
 -        });
 -        translateSwitch.setManagedPreferenceDelegate((ChromeManagedPreferenceDelegate) preference
 -                -> getPrefService().isManagedPreference(Pref.OFFER_TRANSLATE_ENABLED));
+-
+-        targetLanguagePreference.setLanguageItem(TranslateBridge.getTargetLanguage());
+-        setSelectLanguageLauncher(targetLanguagePreference,
+-                AddLanguageFragment.LANGUAGE_OPTIONS_TRANSLATE_LANGUAGES,
+-                REQUEST_CODE_CHANGE_TARGET_LANGUAGE,
+-                LanguagesManager.LanguageSettingsPageType.TARGET_LANGUAGE);
      }
  
      @Override
+@@ -208,13 +139,6 @@ public class LanguageSettings
+                     LanguagesManager.LanguageSettingsActionType.CHANGE_CHROME_LANGUAGE);
+         } else if (requestCode == REQUEST_CODE_CHANGE_TARGET_LANGUAGE
+                 && resultCode == Activity.RESULT_OK) {
+-            String code = data.getStringExtra(AddLanguageFragment.INTENT_SELECTED_LANGUAGE);
+-            LanguageItemPickerPreference targetLanguagePreference =
+-                    (LanguageItemPickerPreference) findPreference(TARGET_LANGUAGE_KEY);
+-            targetLanguagePreference.setLanguageItem(code);
+-            TranslateBridge.setDefaultTargetLanguage(code);
+-            LanguagesManager.recordAction(
+-                    LanguagesManager.LanguageSettingsActionType.CHANGE_TARGET_LANGUAGE);
+         }
+     }
+ 
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-@@ -1172,9 +1172,6 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1184,9 +1184,6 @@ Your Google account may have other forms of browsing history like searches and a
        <message name="IDS_LANGUAGES_LIST_DESCRIPTION" desc="Description on the Languages settings screen. Appears above a list of one or more languages that the user selects, to tell Chrome which languages they prefer to use to read website content.">
          Websites will show text in your preferred language, when possible.
        </message>
@@ -121,7 +179,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
 diff --git a/components/translate/core/browser/translate_manager.cc b/components/translate/core/browser/translate_manager.cc
 --- a/components/translate/core/browser/translate_manager.cc
 +++ b/components/translate/core/browser/translate_manager.cc
-@@ -850,8 +850,9 @@ void TranslateManager::FilterIsTranslatePossible(
+@@ -855,8 +855,9 @@ void TranslateManager::FilterIsTranslatePossible(
          ->LogAutofillAssistantDeferredTriggerDecision();
    }
  

build/patches/ungoogled-chromium-Disable-untraceable-URLs.patch

@@ -4,14 +4,12 @@ Subject: ungoogled-chromium: Disable untraceable URLs
 
 Disable additional URLs that are not caught by the "trk" scheme
 ---
- chrome/browser/android/rlz/rlz_ping_handler.cc           | 2 +-
- chrome/browser/plugins/plugins_resource_service.cc       | 5 +----
- chrome/browser/safe_browsing/client_side_model_loader.cc | 6 ++----
- chrome/browser/safe_browsing/client_side_model_loader.h  | 1 -
- rlz/lib/financial_ping.cc                                | 4 ++--
- rlz/lib/lib_values.cc                                    | 1 -
- rlz/lib/lib_values.h                                     | 1 -
- 7 files changed, 6 insertions(+), 14 deletions(-)
+ chrome/browser/android/rlz/rlz_ping_handler.cc     | 2 +-
+ chrome/browser/plugins/plugins_resource_service.cc | 5 +----
+ rlz/lib/financial_ping.cc                          | 4 ++--
+ rlz/lib/lib_values.cc                              | 1 -
+ rlz/lib/lib_values.h                               | 1 -
+ 5 files changed, 4 insertions(+), 9 deletions(-)
 
 diff --git a/chrome/browser/android/rlz/rlz_ping_handler.cc b/chrome/browser/android/rlz/rlz_ping_handler.cc
 --- a/chrome/browser/android/rlz/rlz_ping_handler.cc
@@ -47,47 +45,6 @@ diff --git a/chrome/browser/plugins/plugins_resource_service.cc b/chrome/browser
  }
  
  }  // namespace
-diff --git a/chrome/browser/safe_browsing/client_side_model_loader.cc b/chrome/browser/safe_browsing/client_side_model_loader.cc
---- a/chrome/browser/safe_browsing/client_side_model_loader.cc
-+++ b/chrome/browser/safe_browsing/client_side_model_loader.cc
-@@ -59,8 +59,6 @@ std::string ReadFileIntoString(base::FilePath path) {
- // Model Loader strings
- const size_t ModelLoader::kMaxModelSizeBytes = 150 * 1024;
- const int ModelLoader::kClientModelFetchIntervalMs = 3600 * 1000;
--const char ModelLoader::kClientModelUrlPrefix[] =
--    "https://ssl.gstatic.com/safebrowsing/csd/";
- const char ModelLoader::kClientModelNamePattern[] =
-     "client_model_v5%s_variation_%d.pb";
- const char ModelLoader::kClientModelFinchExperiment[] =
-@@ -121,7 +119,7 @@ ModelLoader::ModelLoader(
-     scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
-     bool is_extended_reporting)
-     : name_(FillInModelName(is_extended_reporting, GetModelNumber())),
--      url_(kClientModelUrlPrefix + name_),
-+      url_("about:blank"),
-       update_renderers_callback_(update_renderers_callback),
-       url_loader_factory_(url_loader_factory),
-       last_client_model_status_(ClientModelStatus::MODEL_NEVER_FETCHED) {
-@@ -135,7 +133,7 @@ ModelLoader::ModelLoader(
-     scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory,
-     const std::string& model_name)
-     : name_(model_name),
--      url_(kClientModelUrlPrefix + name_),
-+      url_("about:blank"),
-       update_renderers_callback_(update_renderers_callback),
-       url_loader_factory_(url_loader_factory),
-       last_client_model_status_(ClientModelStatus::MODEL_NEVER_FETCHED) {
-diff --git a/chrome/browser/safe_browsing/client_side_model_loader.h b/chrome/browser/safe_browsing/client_side_model_loader.h
---- a/chrome/browser/safe_browsing/client_side_model_loader.h
-+++ b/chrome/browser/safe_browsing/client_side_model_loader.h
-@@ -42,7 +42,6 @@ class ModelLoader {
-   static const int kClientModelFetchIntervalMs;
-   static const char kClientModelFinchExperiment[];
-   static const char kClientModelFinchParam[];
--  static const char kClientModelUrlPrefix[];
-   static const char kClientModelNamePattern[];
- 
-   // Enum used to keep stats about why we fail to get the client model. This
 diff --git a/rlz/lib/financial_ping.cc b/rlz/lib/financial_ping.cc
 --- a/rlz/lib/financial_ping.cc
 +++ b/rlz/lib/financial_ping.cc

build/patches/ungoogled-chromium-Disable-webRTC-log-uploader.patch

@@ -9,7 +9,7 @@ Subject: ungoogled-chromium: Disable webRTC log uploader
 diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
 --- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
 +++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
-@@ -125,28 +125,7 @@ void WebRtcLogUploader::LoggingStoppedDoUpload(
+@@ -126,28 +126,7 @@ void WebRtcLogUploader::LoggingStoppedDoUpload(
    DCHECK(meta_data.get());
    DCHECK(!upload_done_data.paths.directory.empty());
  
@@ -39,7 +39,7 @@ diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser
  }
  
  void WebRtcLogUploader::PrepareMultipartPostData(
-@@ -157,6 +136,11 @@ void WebRtcLogUploader::PrepareMultipartPostData(
+@@ -158,6 +137,11 @@ void WebRtcLogUploader::PrepareMultipartPostData(
    DCHECK(!compressed_log.empty());
    DCHECK(meta_data.get());