Merge pull request #4152 from brave/79.0.3945.70-1.3.x

Upgrade from Chromium 79.0.3945.56 to Chromium 79.0.3945.70 (1.3.x)

android/java/strings/android_chrome_strings.grd

@@ -550,7 +550,7 @@ CHAR-LIMIT guidelines:
         Automatically sign in to websites using stored credentials. When the feature is off, you’ll be asked for verification every time before signing in to a website.
       </message>
       <message name="IDS_PASSWORDS_LEAK_DETECTION_SWITCH_TITLE" desc="Title for the switch toggling whether Brave should check that entered credentials have been part of a leak.">
-        Warn you if passwords are compromised
+        Warn you if passwords are exposed in a data breach
       </message>
       <message name="IDS_PASSWORDS_LEAK_DETECTION_SWITCH_SIGNED_OUT_ENABLE_DESCRIPTION" desc="Description for the switch toggling whether Brave should check that entered credentials have been part of a leak. Displayed for users who are not signed in and syncing.">
         When you sign in to your Brave Account, this feature is turned on

android/java/strings/xr_consent_ui_strings_java.grdp

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!--
-Copyright 2019 Brave Software Inc. All rights reserved.
+Copyright 2019 The Brave Authors. All rights reserved.
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 -->

app/settings_strings.grdp

@@ -965,7 +965,7 @@
     Automatically sign in to websites using stored credentials. If disabled, you will be asked for confirmation every time before signing in to a website.
   </message>
   <message name="IDS_SETTINGS_PASSWORDS_LEAK_DETECTION_LABEL" desc="Label for a checkbox that allows users to choose whether chrome should check that credentials have been part of a leak.">
-    Warn you if passwords are compromised
+    Warn you if passwords are exposed in a data breach
   </message>
   <message name="IDS_SETTINGS_PASSWORDS_LEAK_DETECTION_SIGNED_OUT_ENABLED_DESC" desc="Text that describes the 'Password Leak Detection' functionality to signed-out users who have not disabled the feature.">
     When you sign in to your Brave Account, this feature is turned on

app/xr_consent_ui_strings.grdp

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!--
-Copyright 2019 Brave Software Inc. All rights reserved.
+Copyright 2019 The Brave Authors. All rights reserved.
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 -->

components/password_manager_strings.grdp

@@ -11,17 +11,23 @@
       Check passwords
     </message>
   </if>
-  <message name="IDS_CREDENTIAL_LEAK_TITLE" desc="The title of the credential leak dialog.">
-    Your password was compromised
+  <message name="IDS_CREDENTIAL_LEAK_TITLE_CHANGE" desc="The title of the credential leak dialog when the user should change the password now.">
+    Change your password
+  </message>
+  <message name="IDS_CREDENTIAL_LEAK_TITLE_CHECK" desc="The title of the credential leak dialog when the user should check all passwords on passwords.google.com.">
+    Check your passwords
   </message>
   <message name="IDS_CREDENTIAL_LEAK_CHECK_PASSWORDS_MESSAGE" desc="The text that is used in credential leak detection dialog when saved credentials were used on multiple sites.">
-    A data breach occurred on a site or app you use. Brave recommends checking your saved passwords now.
+    A data breach on a site or app exposed your password. Brave recommends checking your saved passwords now.
   </message>
   <message name="IDS_CREDENTIAL_LEAK_CHANGE_PASSWORD_MESSAGE" desc="The text that is used in credential leak detection dialog when credentials were leaked on current site only.">
-    A data breach occurred on a site or app you use. Brave recommends changing your password on <ph name="ORIGIN">$1<ex>example.com</ex></ph> now.
+    A data breach on a site or app exposed your password. Brave recommends changing your password on <ph name="ORIGIN">$1<ex>example.com</ex></ph> now.
   </message>
   <message name="IDS_CREDENTIAL_LEAK_CHANGE_AND_CHECK_PASSWORDS_MESSAGE" desc="The text that is used in credential leak detection dialog when credentials were not saved in chrome, but used on multiple sites.">
-    A data breach occurred on a site or app you use. Brave recommends checking your saved passwords and changing your password on <ph name="ORIGIN">$1<ex>example.com</ex></ph> now.
+    A data breach on a site or app exposed your password. Brave recommends checking your saved passwords and changing your password on <ph name="ORIGIN">$1<ex>example.com</ex></ph> now.
+  </message>
+  <message name="IDS_PASSWORD_MANAGER_LEAK_HELP_MESSAGE" desc="The text is shown in a popup that explains to the user why they are seeing a warning about leaked passwords. This is a stand-alone string and the only content of the popup dialog.">
+    Brave periodically checks your passwords against lists that have been published online. When doing this, your passwords and usernames are encrypted, so they can’t be read by anyone, including Brave.
   </message>
   <message name="IDS_MANAGE_PASSWORDS_AUTO_SIGNIN_TITLE" desc="The title of the auto-signin toast.">
     Signing in as <ph name="username">$1<ex>chef@google.com</ex></ph>

patches/chrome-VERSION.patch

@@ -1,12 +1,12 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index dfbc011883991719c671af22b6befef2301e2f94..c6ddf0d56858263cdbce588cda9b41b2e22208e4 100644
+index 3cbcec3b99f70599f35eac6d5404b2b397ed175b..8c842648453f451be5d26d6769ead14def282655 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=79
 -MINOR=0
 -BUILD=3945
--PATCH=56
+-PATCH=70
 +MINOR=1
 +BUILD=3
 +PATCH=58

patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
-index a72a7f8d99927fd4950fed12ef9093cd3dc32464..539b3a832f547595e64e305ee153ccae41d34cbd 100644
+index 72fd16d8323cf2f58e953f7e50c3d6acf20a5294..ef2c84f4fd046843a2cd31f91f5f71b7be195dd5 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
 @@ -757,6 +757,7 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF

patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
-index 0a3c72822a830c3fa085b85818b59e77df323eff..bfee5c9f457d926248ab0e123429da85d864273b 100644
+index bc3a4815f31f119892cf5b2b768a384499ecf11d..ffa8b31c7b40857ccd8b41ef02d8b80681634ab4 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
-@@ -86,7 +86,7 @@ import java.util.List;
+@@ -87,7 +87,7 @@ import java.util.List;
  /**
   * Phone specific toolbar implementation.
   */
@@ -11,7 +11,7 @@ index 0a3c72822a830c3fa085b85818b59e77df323eff..bfee5c9f457d926248ab0e123429da85
                                                             NewTabPage.OnSearchBoxScrollListener,
                                                             TabCountObserver {
      /** The amount of time transitioning from one theme color to another should take in ms. */
-@@ -419,10 +419,12 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
+@@ -420,10 +420,12 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
      /**
       * Set the background color of the location bar to appropriately match the theme color.
       */
@@ -25,15 +25,15 @@ index 0a3c72822a830c3fa085b85818b59e77df323eff..bfee5c9f457d926248ab0e123429da85
      }
 
      /**
-@@ -539,6 +541,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
+@@ -540,6 +542,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
                          .notifyEvent(EventConstants.PARTNER_HOME_PAGE_BUTTON_PRESSED);
              }
          }
 +        super.onClick(v);
      }
 
      @Override
-@@ -712,7 +715,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
+@@ -713,7 +716,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
       * @return The right bounds of the location bar after accounting for any visible left buttons.
       */
      private int getBoundsAfterAccountingForRightButtons() {
@@ -42,7 +42,7 @@ index 0a3c72822a830c3fa085b85818b59e77df323eff..bfee5c9f457d926248ab0e123429da85
      }
 
      private void updateToolbarBackground(int color) {
-@@ -2165,6 +2168,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
+@@ -2171,6 +2174,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
          } else {
              populateUrlClearFocusingAnimatorSet(animators);
          }

patches/chrome-browser-resources-settings-autofill_page-passwords_section.html.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/autofill_page/passwords_section.html b/chrome/browser/resources/settings/autofill_page/passwords_section.html
-index 7f921b70cf04f001001a78416ad58929391e6dc6..0733e99087d0b0cdc170a67119f78ce85cf1b416 100644
+index 2f569d3e4dca3168f8386c55d9dd3289417227ad..d64bd672bbc7b54dd747a67fd33d606db87dccf3 100644
 --- a/chrome/browser/resources/settings/autofill_page/passwords_section.html
 +++ b/chrome/browser/resources/settings/autofill_page/passwords_section.html
-@@ -90,11 +90,15 @@
+@@ -80,11 +80,15 @@
          label="$i18n{passwordsAutosigninLabel}"
          sub-label="$i18n{passwordsAutosigninDescription}">
      </settings-toggle-button>

patches/chrome-browser-resources-settings-privacy_page-personalization_options.html.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/resources/settings/privacy_page/personalization_options.html b/chrome/browser/resources/settings/privacy_page/personalization_options.html
-index 491eff1b6aab66e6d4d5edae4b2d7f198031e905..1b1f4faa57ae5dba07a48fc2adaac2b5eb7a8a25 100644
+index 34d663a378fddf7abb940696ff9b702724385372..0d430852ef4e45aa30bccab3c20a507034410d6e 100644
 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.html
 +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.html
-@@ -10,6 +10,9 @@
+@@ -12,6 +12,9 @@
  <link rel="import" href="../route.html">
  <link rel="import" href="../settings_shared_css.html">
  <link rel="import" href="privacy_page_browser_proxy.html">
@@ -12,7 +12,7 @@ index 491eff1b6aab66e6d4d5edae4b2d7f198031e905..1b1f4faa57ae5dba07a48fc2adaac2b5
 
  <!--
   * Note: If a synced pref is added/removed from this file, the method
-@@ -35,19 +38,26 @@
+@@ -37,14 +40,19 @@
          label="$i18n{searchSuggestPref}"
          sub-label="$i18n{searchSuggestPrefDesc}">
      </settings-toggle-button>
@@ -29,17 +29,26 @@ index 491eff1b6aab66e6d4d5edae4b2d7f198031e905..1b1f4faa57ae5dba07a48fc2adaac2b5
 +    <if expr="not _google_chrome">
 +      <settings-brave-personalization-options prefs="{{prefs}}"></settings-brave-personalization-options>
 +    </if>
+    <settings-toggle-button id="passwordsLeakDetectionCheckbox"
+       pref="{{prefs.profile.password_manager_leak_detection}}"
+       checked="[[getCheckedLeakDetection_(
+@@ -56,6 +64,7 @@
+       disabled="[[getDisabledLeakDetection_(
+           userSignedIn_, prefs.*)]]">
+     </settings-toggle-button>
 +    <if expr="_google_chrome">
      <settings-toggle-button
          pref="{{prefs.safebrowsing.scout_reporting_enabled}}"
-         label="$i18n{safeBrowsingEnableExtendedReporting}"
-         sub-label="$i18n{safeBrowsingEnableExtendedReportingDesc}">
+         checked="[[getCheckedExtendedSafeBrowsing_(prefs.*)]]"
+@@ -63,6 +72,7 @@
+         sub-label="$i18n{safeBrowsingEnableExtendedReportingDesc}"
+         disabled="[[getDisabledExtendedSafeBrowsing_(prefs.*)]]">
      </settings-toggle-button>
 +    </if>
  <if expr="_google_chrome">
  <if expr="chromeos">
      <settings-toggle-button pref="{{prefs.cros.metrics.reportingEnabled}}"
-@@ -55,6 +65,8 @@
+@@ -70,6 +80,8 @@
          sub-label="$i18n{enableLoggingDesc}">
      </settings-toggle-button>
  </if><!-- chromeos -->
@@ -48,7 +57,7 @@ index 491eff1b6aab66e6d4d5edae4b2d7f198031e905..1b1f4faa57ae5dba07a48fc2adaac2b5
  <if expr="not chromeos">
      <settings-toggle-button id="metricsReportingControl"
          pref="[[metricsReportingPref_]]" label="$i18n{enableLogging}"
-@@ -68,7 +80,7 @@
+@@ -83,7 +95,7 @@
        </template>
      </settings-toggle-button>
  </if><!-- not chromeos -->

patches/chrome-browser-resources-settings-privacy_page-personalization_options.js.patch

@@ -1,17 +1,17 @@
 diff --git a/chrome/browser/resources/settings/privacy_page/personalization_options.js b/chrome/browser/resources/settings/privacy_page/personalization_options.js
-index f3a7ad0b10b18de16e2feae7c9254f0ad480bf5b..bcce96dbb7a90974ad35cfc1651864d60505b370 100644
+index 5d066a1dee6901c29e4cdf7dd5adee12a2ec3965..3faa7d0888fecd80c5a459b0852ad8dd8f6af220 100644
 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.js
 +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.js
-@@ -34,7 +34,7 @@ Polymer({
-     /** @type {settings.SyncStatus} */
-     syncStatus: Object,
+@@ -58,7 +58,7 @@ Polymer({
+       value: loadTimeData.getBoolean('passwordsLeakDetectionEnabled'),
+     },
 
 -    // <if expr="_google_chrome and not chromeos">
 +    // <if expr="_chromium and not chromeos">
      // TODO(dbeam): make a virtual.* pref namespace and set/get this normally
      // (but handled differently in C++).
      /** @private {chrome.settingsPrivate.PrefObject} */
-@@ -56,14 +56,14 @@ Polymer({
+@@ -80,7 +80,7 @@ Polymer({
    ready: function() {
      this.browserProxy_ = settings.PrivacyPageBrowserProxyImpl.getInstance();
 
@@ -20,7 +20,8 @@ index f3a7ad0b10b18de16e2feae7c9254f0ad480bf5b..bcce96dbb7a90974ad35cfc1651864d6
      const setMetricsReportingPref = this.setMetricsReportingPref_.bind(this);
      this.addWebUIListener('metrics-reporting-change', setMetricsReportingPref);
      this.browserProxy_.getMetricsReporting().then(setMetricsReportingPref);
-     // </if>
+@@ -165,7 +165,7 @@ Polymer({
+     return !this.getPref('safebrowsing.enabled').value;
    },
 
 -  // <if expr="_google_chrome and not chromeos">

patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.cc.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/profiles/avatar_toolbar_button.cc b/chrome/browser/ui/views/profiles/avatar_toolbar_button.cc
-index b6e0a0f51d5dc9c05afeae38c32f4cd8549933e2..5b63c8a2f6af4111863b6a8063dec47e4bf5b0df 100644
+index 8076cdd859d4acd4e96e9ebd7ad1788de1fee901..11e0ba1f5aaacff1bf054a75bce6d4379901cbcd 100644
 --- a/chrome/browser/ui/views/profiles/avatar_toolbar_button.cc
 +++ b/chrome/browser/ui/views/profiles/avatar_toolbar_button.cc
-@@ -455,6 +455,7 @@ void AvatarToolbarButton::MaybeHideIdentityAnimation() {
+@@ -451,6 +451,7 @@ void AvatarToolbarButton::MaybeHideIdentityAnimation() {
  }
 
  base::string16 AvatarToolbarButton::GetAvatarTooltipText() const {

patches/chrome-renderer-chrome_content_renderer_client.cc.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
-index 4d3cfef5b28a8798caa6a9e04b260ba10d9ab068..f5415881cbbf9a550a88bb88b290d7d9bd3feb43 100644
+index 0948ebbbd1999adc50dfc64cd9bd5072c977bbbe..eb2c3cca5991266dc0d3b5a5791a644f0e635705 100644
 --- a/chrome/renderer/chrome_content_renderer_client.cc
 +++ b/chrome/renderer/chrome_content_renderer_client.cc
 @@ -22,6 +22,7 @@

patches/chrome-renderer-chrome_content_renderer_client.h.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h
-index 63be9235f7f6c66f49698ec05fed8581caaddac5..3c0fdb88d24cf0180a7bcfed705f8e07f11ed31a 100644
+index d306846f872ee27a07a67f80fc4dd8740458e47c..c811bd8de9c861b466ceea8f00815ae8c8507c08 100644
 --- a/chrome/renderer/chrome_content_renderer_client.h
 +++ b/chrome/renderer/chrome_content_renderer_client.h
-@@ -236,6 +236,7 @@ class ChromeContentRendererClient
+@@ -241,6 +241,7 @@ class ChromeContentRendererClient
    ChromeRenderThreadObserver* GetChromeObserver() const;
 
   private:

patches/content-public-test-browser_test_utils.cc.patch

@@ -1,5 +1,5 @@
 diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc
-index 0c993172edd745f0241b087fa6a6f9b47e9c3f70..4b7357424cfc16c41e94f1fabd7ab010c56e6cc9 100644
+index 4242c75f32105ce5c9d48864afa8bd6e07d47654..ba8976537fc264237e86efbd7235fe95bea925c5 100644
 --- a/content/public/test/browser_test_utils.cc
 +++ b/content/public/test/browser_test_utils.cc
 @@ -1854,6 +1854,7 @@ bool SetCookie(BrowserContext* browser_context,

patches/third_party-blink-renderer-core-BUILD.gn.patch

@@ -1,5 +1,5 @@
 diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn
-index a47c78114a94a9610f179a21023f638a63ca4572..bf322ff2a6b760177d2fbeee924b0091da2b9fea 100644
+index 211ffc068bc6294fb5f38976c650ee304e1d3f19..ef6462723d83771633aff8d438084865b9427bb0 100644
 --- a/third_party/blink/renderer/core/BUILD.gn
 +++ b/third_party/blink/renderer/core/BUILD.gn
 @@ -212,6 +212,7 @@ component("core") {

patches/tools-metrics-histograms-histograms.xml.patch

@@ -1,8 +1,8 @@
 diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
-index 3f1ca7bbc23e5355daa9ef3665027b005275bd77..312c673bcd06c587e4db406bdb513368da5ab095 100644
+index b972a144a5f64ebc23ec88ebca983abbe0cf5ffa..ab5a04dc169707664a7489f8b547d4f13ca45c62 100644
 --- a/tools/metrics/histograms/histograms.xml
 +++ b/tools/metrics/histograms/histograms.xml
-@@ -176297,6 +176297,7 @@ regressions. -->
+@@ -176310,6 +176310,7 @@ regressions. -->
    <suffix name="ProtectedMedia" label="Protected media permission"/>
    <suffix name="PushMessaging" label="Push messaging permission"/>
    <suffix name="Quota" label="Quota permission"/>