Merge pull request #6407 from brave/85.0.4183.69_master_51

Upgrade patches from Chromium 85.0.4183.59 to Chromium 85.0.4183.69

app/generated_resources.grd

@@ -5748,7 +5748,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
           Select where to save your password
         </message>
         <message name="IDS_PASSWORD_MANAGER_DESTINATION_DROPDOWN_SAVE_TO_ACCOUNT" desc="Text shown in the destination dropdown in the password save bubble when saving to the account">
-          Save in your Brave Account
+          Save in your Brave sync chain
         </message>
         <message name="IDS_PASSWORD_MANAGER_DESTINATION_DROPDOWN_SAVE_TO_DEVICE" desc="Text shown in the destination dropdown in the password save bubble when saving to the device">
           Save only on this device
@@ -5760,7 +5760,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
           This password will be saved on this device
         </message>
         <message name="IDS_PASSWORD_MANAGER_IPH_BODY_SAVE_TO_ACCOUNT" desc="Body of the in Product Help shown when the 'Save to account` is selected">
-          You can save this password in your Brave Account or only on this device
+          You can save this password in your Brave sync chain or only on this device
         </message>
         <message name="IDS_PASSWORD_MANAGER_TOOLTIP_SAVE" desc="Text for the 'Manage Passwords' icon's 'password to be saved' state">
           Save your password
@@ -5796,7 +5796,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
           Passwords not saved
         </message>
         <message name="IDS_PASSWORD_MANAGER_UNSYNCED_CREDENTIALS_BUBBLE_DESCRIPTION" desc="The description text of the 'save unsynced credentials' bubble.">
-          Brave couldn't save these passwords in your Brave Account. You can still save them on this device.
+          Brave couldn't save these passwords in your Brave sync chain. You can still save them on this device.
         </message>
         <message name="IDS_PASSWORD_MANAGER_SAVE_UNSYNCED_CREDENTIALS_BUTTON" desc="Button text for the 'save unsynced credentials' bubble's save option.">
           Save
@@ -7497,13 +7497,13 @@ Keep your key file in a safe place. You will need it to create new versions of y
 
       <!-- Account password storage reauth tab modal dialog -->
       <message name="IDS_ACCOUNT_PASSWORDS_REAUTH_SAVE_TITLE" desc="Title of the account password storage reauth tab modal dialog. The dialog was shown because the user requested to save a password to their Brave account.">
-        Save this and other passwords in your Brave Account?
+        Save this and other passwords in your Brave sync chain?
       </message>
       <message name="IDS_ACCOUNT_PASSWORDS_REAUTH_SHOW_TITLE" desc="Title of the account password storage reauth tab modal dialog. The dialog was shown because the user requested to get passwords from their Brave account.">
-        Show passwords from your Brave Account
+        Show passwords from your Brave sync chain
       </message>
       <message name="IDS_ACCOUNT_PASSWORDS_REAUTH_DESC" desc="Body of the account password storage reauth tab modal dialog.">
-        Your passwords from your Brave Account will also be available on this device while you're signed in
+        Your passwords from your Brave sync chain will also be available on this device while you're signed in
       </message>
       <message name="IDS_ACCOUNT_PASSWORDS_REAUTH_SAVE_BUTTON_LABEL" desc="Label of the confirmation button in the account password storage reauth tab modal dialog. The dialog was shown because the user requested to save a password to their Brave account.">
         Save

app/settings_strings.grdp

@@ -496,32 +496,32 @@
   <message name="IDS_SETTINGS_PASSWORD_DELETED_PASSWORD_FROM_ACCOUNT_AND_DEVICE" desc="Label for an undo tooltip following deletion of a password from the account and the device.">
     Password deleted from this device and your Brave sync chain
   </message>
-  <message name="IDS_SETTINGS_PASSWORD_MOVE_TO_ACCOUNT_DIALOG_TITLE" desc="Title for the dialog that confirms whether the user wishes to move a password to their Brave Account.">
+  <message name="IDS_SETTINGS_PASSWORD_MOVE_TO_ACCOUNT_DIALOG_TITLE" desc="Title for the dialog that confirms whether the user wishes to move a password to their Brave sync chain.">
     Move to Brave sync chain?
   </message>
-  <message name="IDS_SETTINGS_PASSWORD_MOVE_TO_ACCOUNT_DIALOG_BODY" desc="Description message for the dialog that confirms whether the user wishes to move a password to their Brave Account.">
+  <message name="IDS_SETTINGS_PASSWORD_MOVE_TO_ACCOUNT_DIALOG_BODY" desc="Description message for the dialog that confirms whether the user wishes to move a password to their Brave sync chain.">
     Move your password to your Brave sync chain to access it securely wherever you're signed in
   </message>
-  <message name="IDS_SETTINGS_PASSWORD_MOVE_TO_ACCOUNT_DIALOG_MOVE_BUTTON_TEXT" desc="Text for the button that confirms moving a password to the user Brave Account.">
+  <message name="IDS_SETTINGS_PASSWORD_MOVE_TO_ACCOUNT_DIALOG_MOVE_BUTTON_TEXT" desc="Text for the button that confirms moving a password to the user Brave sync chain.">
     Move
   </message>
-  <message name="IDS_SETTINGS_PASSWORD_MOVE_TO_ACCOUNT_DIALOG_CANCEL_BUTTON_TEXT" desc="Text for the button that cancels the action of moving a password to the user Brave Account.">
+  <message name="IDS_SETTINGS_PASSWORD_MOVE_TO_ACCOUNT_DIALOG_CANCEL_BUTTON_TEXT" desc="Text for the button that cancels the action of moving a password to the user Brave sync chain.">
     No, thanks
   </message>
-  <message name="IDS_SETTINGS_PASSWORD_REMOVE_DIALOG_TITLE" desc="Title for the dialog that asks the user which versions of a password to remove (device, Brave Account or both).">
+  <message name="IDS_SETTINGS_PASSWORD_REMOVE_DIALOG_TITLE" desc="Title for the dialog that asks the user which versions of a password to remove (device, Brave sync chain or both).">
     Delete password?
   </message>
   <!-- TODO(crbug.com/1102294): Inject the website in the string. -->
-  <message name="IDS_SETTINGS_PASSWORD_REMOVE_DIALOG_BODY" desc="Description message for the dialog that asks the user which versions of a password to remove (device, Brave Account or both).">
+  <message name="IDS_SETTINGS_PASSWORD_REMOVE_DIALOG_BODY" desc="Description message for the dialog that asks the user which versions of a password to remove (device, Brave sync chain or both).">
     Your password is stored on this device and in your Brave sync chain. Which one do you want to delete?
   </message>
-  <message name="IDS_SETTINGS_PASSWORD_REMOVE_DIALOG_REMOVE_BUTTON_TEXT" desc="Text for the button that confirms the action in the dialog that asks the user which versions of a password to remove (device, Brave Account or both).">
+  <message name="IDS_SETTINGS_PASSWORD_REMOVE_DIALOG_REMOVE_BUTTON_TEXT" desc="Text for the button that confirms the action in the dialog that asks the user which versions of a password to remove (device, Brave sync chain or both).">
     Delete
   </message>
-  <message name="IDS_SETTINGS_PASSWORD_REMOVE_DIALOG_CANCEL_BUTTON_TEXT" desc="Text for the button that cancels the action in the dialog that asks the user which versions of a password to remove (device, Brave Account or both).">
+  <message name="IDS_SETTINGS_PASSWORD_REMOVE_DIALOG_CANCEL_BUTTON_TEXT" desc="Text for the button that cancels the action in the dialog that asks the user which versions of a password to remove (device, Brave sync chain or both).">
     Cancel
   </message>
-  <message name="IDS_SETTINGS_PASSWORD_REMOVE_DIALOG_FROM_ACCOUNT_CHECKBOX_LABEL" desc="The label for the checkbox that represents whether the user wishes to remove a password from their Brave Account.">
+  <message name="IDS_SETTINGS_PASSWORD_REMOVE_DIALOG_FROM_ACCOUNT_CHECKBOX_LABEL" desc="The label for the checkbox that represents whether the user wishes to remove a password from their Brave sync chain.">
     From your Brave sync chain
   </message>
   <message name="IDS_SETTINGS_PASSWORD_REMOVE_DIALOG_FROM_DEVICE_CHECKBOX_LABEL" desc="The label for the checkbox that represents whether the user wishes to remove a password from the device.">

browser/ui/android/strings/android_chrome_strings.grd

@@ -1874,8 +1874,8 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
       <message name="IDS_CONTEXTMENU_OPEN_IN_EPHEMERAL_TAB" desc="Context-sensitive menu item to open a quick preview of the selected linked page.   Note that 'preview' is a verb, not a noun. We're also labeling it *New* to draw attention to it when first released. The selected link will open in an overlay panel on top of the current tab which will go away easily too. [CHAR-LIMIT=30]">
         Preview page <ph name="BEGIN_NEW">&lt;new&gt;</ph>New<ph name="END_NEW">&lt;/new&gt;</ph>
       </message>
-      <message name="IDS_CONTEXTMENU_PERFORMANCE_INFO_FAST" desc="This string is shown in the context sensitive menu for links and is shown underneath the link URL. It indicates to the user that the link's target website should load quickly. [CHAR-LIMIT=30]">
-        Fast site
+      <message name="IDS_CONTEXTMENU_PERFORMANCE_INFO_FAST" desc="This string is shown in the context sensitive menu for links and is shown underneath the link URL. It indicates to the user that the link's target page is fast-loading and responsive. [CHAR-LIMIT=30]">
+        Fast page
       </message>
 
       <!-- Swipe refresh -->
@@ -3839,6 +3839,26 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
       <message name="IDS_LITE_MODE_HTTPS_IMAGE_COMPRESSION_SETTINGS_LINK" desc="This link opens the Lite Mode settings page to explain the feature and configure the settings.">
         Manage
       </message>
+
+      <!-- Browser Promo Notification Strings -->
+      <message name="IDS_CHROME_REENGAGEMENT_NOTIFICATION_1_TITLE" desc="The title of a notification shown to suggest that users use Brave.  Users probably have not opened Brave in a while.  Promotes relevant articles Brave has.">
+        Read today's news <ph name="NEWS_ICON">📰</ph>
+      </message>
+      <message name="IDS_CHROME_REENGAGEMENT_NOTIFICATION_1_DESCRIPTION" desc="The body text of a notification shown to suggest that users use Brave.  Users probably have not opened Brave in a while.  Promotes relevant articles Brave has.">
+        Articles on your interests on Brave
+      </message>
+      <message name="IDS_CHROME_REENGAGEMENT_NOTIFICATION_2_TITLE" desc="The title of a notification shown to suggest that users use Brave.  Users probably have not opened Brave in a while.  Promotes data savings.">
+        Save up to 60% data
+      </message>
+      <message name="IDS_CHROME_REENGAGEMENT_NOTIFICATION_2_DESCRIPTION" desc="The body text of a notification shown to suggest that users use Brave.  Users probably have not opened Brave in a while.  Promotes data savings.">
+        Use Lite mode on Brave
+      </message>
+      <message name="IDS_CHROME_REENGAGEMENT_NOTIFICATION_3_TITLE" desc="The title of a notification shown to suggest that users use Brave.  Users probably have not opened Brave in a while.">
+        Brave recommends Brave
+      </message>
+      <message name="IDS_CHROME_REENGAGEMENT_NOTIFICATION_3_DESCRIPTION" desc="The title of a notification shown to suggest that users use Brave.  Users probably have not opened Brave in a while.  Promotes data savings and relevant news.">
+        Save up to 60% data, read today's news
+      </message>
     </messages>
   </release>
 </grit>

patches/chrome-VERSION.patch

@@ -1,12 +1,12 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index 9f2a3398069085dc0b449106db062404274bc3c8..fccb5ade068595ed5d8590d549b78caf56c2079a 100644
+index e96d11eac5034481f7c8018455f6a4110d2b3c29..2a49c7718e831f1b3f84bbefa1c935e7f215bcea 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=85
 -MINOR=0
 -BUILD=4183
--PATCH=59
+-PATCH=69
 +MINOR=1
 +BUILD=14
 +PATCH=42

patches/chrome-android-BUILD.gn.patch

@@ -1,40 +1,40 @@
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index 09dadfdd96e8aa627c92f795a26cf7f7cced2e97..cb7fbb6da29ecfa833124f67998335c276a1d7d1 100644
+index 363ef7af63be571a610f79c17b202fc5280ca5d5..9c36b709cdaa23bc8cad6f5ece3be8560f8798b2 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
-@@ -232,6 +232,7 @@ android_resources("chrome_app_java_resources") {
+@@ -217,6 +217,7 @@ android_resources("chrome_app_java_resources") {
      "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
      "//third_party/android_deps:com_google_android_material_material_java",
    ]
 +  deps += brave_chrome_app_java_resources_deps sources += brave_java_resources
    custom_package = "org.chromium.chrome"
  }
 
-@@ -501,6 +502,7 @@ android_library("chrome_java") {
+@@ -486,6 +487,7 @@ android_library("chrome_java") {
    ]
 
    deps += feed_deps
 +  deps += brave_chrome_java_deps
 
    srcjar_deps = [
      ":chrome_android_java_enums_srcjar",
-@@ -540,6 +542,7 @@ android_library("chrome_java") {
+@@ -525,6 +527,7 @@ android_library("chrome_java") {
      "//net:effective_connection_type_java",
      "//net/dns:secure_dns_mode_generated_enum",
    ]
 +  srcjar_deps += brave_chrome_java_srcjar_deps
 
    # From java_sources.gni.
    sources = chrome_java_sources + [
-@@ -644,6 +647,7 @@ group("jni_headers") {
+@@ -629,6 +632,7 @@ group("jni_headers") {
      "//chrome/browser/ui/messages/android:jni_headers",
      "//chrome/browser/util:jni_headers",
    ]
 +  public_deps += ["//brave/build/android:jni_headers"]
  }
 
  action("chrome_android_java_google_api_keys_srcjar") {
-@@ -1672,6 +1676,7 @@ if (current_toolchain == default_toolchain) {
+@@ -1657,6 +1661,7 @@ if (current_toolchain == default_toolchain) {
          ":${_variant}_locale_pak_assets",
          ":${_variant}_paks",
        ]

patches/chrome-android-chrome_java_sources.gni.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
-index 1031b522994973a87c07127034e4742f1033f7e8..f8ecc8b44f75dcea8b8172b77f2fc712fdb021ba 100644
+index 27d29dc46ff919a3235f47b482e38f6c297b2f39..a6b5b57d935a98dd130267e5f0579c54050af32b 100644
 --- a/chrome/android/chrome_java_sources.gni
 +++ b/chrome/android/chrome_java_sources.gni
-@@ -1765,3 +1765,4 @@ chrome_java_sources = [
+@@ -1768,3 +1768,4 @@ chrome_java_sources = [
    "java/src/org/chromium/chrome/browser/widget/DateDividedAdapter.java",
    "java/src/org/chromium/chrome/browser/widget/ScrimView.java",
  ]

patches/chrome-android-java-AndroidManifest.xml.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
-index fe997b1eda853e4e01182d3ab0f892b3d555882f..0c4109598e9a3cd07ca4ed9ff89ab0fbc8617184 100644
+index a9b1a61d10cfeace5f5ed258a92a27ec9811a7ca..ddd8c4e2eb08abd07375417c569e388f254a4de3 100644
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
 @@ -34,7 +34,9 @@ by a child template that "extends" this file.
@@ -62,7 +62,7 @@ index fe997b1eda853e4e01182d3ab0f892b3d555882f..0c4109598e9a3cd07ca4ed9ff89ab0fb
          {% endif %}
 
          <!-- Cast support -->
-@@ -1178,6 +1190,7 @@ by a child template that "extends" this file.
+@@ -1184,6 +1196,7 @@ by a child template that "extends" this file.
          </activity>
          {% endif %}
 

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

@@ -1,8 +1,8 @@
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-index ab8b2d0aedd4ff245380de874a2711ff619816eb..ebc8686e035352701a4b454f6f52cba0f407d78d 100644
+index c61bf8d408484990ad328db5725f9444419c3e6c..a4163cceeb8cf649102b8947dc9fffe7efab632f 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
-@@ -184,7 +184,7 @@ import java.util.Locale;
+@@ -189,7 +189,7 @@ import java.util.Locale;
   * This is the main activity for ChromeMobile when not running in document mode.  All the tabs
   * are accessible via a chrome specific tab switching UI.
   */
@@ -11,7 +11,16 @@ index ab8b2d0aedd4ff245380de874a2711ff619816eb..ebc8686e035352701a4b454f6f52cba0
          implements ChromeAccessibilityUtil.Observer {
      private static final String TAG = "ChromeTabbedActivity";
 
-@@ -1683,7 +1683,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -1131,7 +1131,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+         if (ReengagementNotificationController.isEnabled()) {
+             if (mCallbackController != null) {
+                 new OneShotCallback<>(
+-                        mTabModelProfileSupplier, mCallbackController.makeCancelable(profile -> {
++                        mTabModelProfileSupplier, mCallbackController.makeCancelable((Profile profile) -> {
+                             assert profile != null : "Unexpectedly null profile from TabModel.";
+                             if (profile == null) return;
+
+@@ -1706,7 +1706,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
 
      @Override
      public AppMenuPropertiesDelegate createAppMenuPropertiesDelegate() {
@@ -20,7 +29,7 @@ index ab8b2d0aedd4ff245380de874a2711ff619816eb..ebc8686e035352701a4b454f6f52cba0
                  getMultiWindowModeStateDispatcher(), getTabModelSelector(), getToolbarManager(),
                  getWindow().getDecorView(), this,
                  mOverviewModeController.mOverviewModeBehaviorSupplier, mBookmarkBridgeSupplier);
-@@ -1706,9 +1706,9 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -1729,9 +1729,9 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
                  }
              };
          }
@@ -32,7 +41,7 @@ index ab8b2d0aedd4ff245380de874a2711ff619816eb..ebc8686e035352701a4b454f6f52cba0
                          tabDelegateFactorySupplier, true, overviewNTPCreator));
      }
 
-@@ -2097,7 +2097,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
+@@ -2120,7 +2120,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
          }
      }