Merge pull request #8729 from brave/91.0.4472.38

Upgrade from Chromium 91.0.4472.19 to Chromium 91.0.4472.38.

app/generated_resources.grd

@@ -610,7 +610,7 @@ are declared in tools/grit/grit_rule.gni.
           </message>
 
           <message name="IDS_CONTENT_CONTEXT_REMOVELINKTOTEXT" desc="The name of the Remove Highlights command in the content area context menu">
-            Remove highlights
+            Remove highlight
           </message>
 
           <message name="IDS_CONTENT_CONTEXT_SAVEIMAGEAS" desc="The name of the Save Image As command in the content area context menu">
@@ -839,7 +839,7 @@ are declared in tools/grit/grit_rule.gni.
           </message>
 
           <message name="IDS_CONTENT_CONTEXT_REMOVELINKTOTEXT" desc="In TitleCase: The name of the Remove Highlights command in the content area context menu">
-            Remove Highlights
+            Remove Highlight
           </message>
 
           <message name="IDS_CONTENT_CONTEXT_SAVEIMAGEAS" desc="In Title Case: The name of the Save Image As command in the content area context menu">
@@ -6173,10 +6173,10 @@ Keep your key file in a safe place. You will need it to create new versions of y
           Suggest strong password
         </message>
         <message name="IDS_UPDATE_PASSWORD_DIALOG_TITLE" desc="The title of the update password dialog.">
-          Update password for <ph name="ORIGIN">$1<ex>example.com</ex></ph>
+          Update password for <ph name="ORIGIN">%1$s<ex>example.com</ex></ph>
         </message>
         <message name="IDS_UPDATE_PASSWORD_DIALOG_SIGNED_IN_DESCRIPTION" desc="The description at the bottom of update password dialog when the user is signed in.">
-          Passwords are saved in your Brave sync chain (<ph name="ACCOUNT">$1<ex>[email protected]</ex></ph>) so you can use them on any device
+          Passwords are saved in your Brave sync chain (<ph name="ACCOUNT">%1$s<ex>[email protected]</ex></ph>) so you can use them on any device
         </message>
       </if>
 

app/nearby_share_strings.grdp

@@ -157,25 +157,25 @@
     {COUNT, plural, =1 {App} other {# apps}}
   </message>
   <message name="IDS_NEARBY_FILE_ATTACHMENTS_NOT_CAPITALIZED_APPS" desc="Describes one or more apps being transfered via Nearby Share. Singular case is not capitalized, e.g. 'app'.">
-    {COUNT, plural, =1 {app} other {# apps}}
+    {COUNT, plural, =1 {an app} other {# apps}}
   </message>
   <message name="IDS_NEARBY_FILE_ATTACHMENTS_CAPITALIZED_IMAGES" desc="Describes one or more images being transfered via Nearby Share. Singular case is capitalized, e.g. 'Image'.">
     {COUNT, plural, =1 {Image} other {# images}}
   </message>
   <message name="IDS_NEARBY_FILE_ATTACHMENTS_NOT_CAPITALIZED_IMAGES" desc="Describes one or more images being transfered via Nearby Share. Singular case is not capitalized, e.g. 'image'.">
-    {COUNT, plural, =1 {image} other {# images}}
+    {COUNT, plural, =1 {an image} other {# images}}
   </message>
   <message name="IDS_NEARBY_FILE_ATTACHMENTS_CAPITALIZED_UNKNOWN" desc="Describes one or more files being transfered via Nearby Share. Singular case is capitalized, e.g. 'File'.">
     {COUNT, plural, =1 {File} other {# files}}
   </message>
   <message name="IDS_NEARBY_FILE_ATTACHMENTS_NOT_CAPITALIZED_UNKNOWN" desc="Describes one or more files being transfered via Nearby Share. Singular case is not capitalized, e.g. 'file'.">
-    {COUNT, plural, =1 {file} other {# files}}
+    {COUNT, plural, =1 {a file} other {# files}}
   </message>
   <message name="IDS_NEARBY_FILE_ATTACHMENTS_CAPITALIZED_VIDEOS" desc="Describes one or more videos being transfered via Nearby Share. Singular case is capitalized, e.g. 'Video'.">
     {COUNT, plural, =1 {Video} other {# videos}}
   </message>
   <message name="IDS_NEARBY_FILE_ATTACHMENTS_NOT_CAPITALIZED_VIDEOS" desc="Describes one or more videos being transfered via Nearby Share. Singular case is not capitalized, e.g. 'video'.">
-    {COUNT, plural, =1 {video} other {# videos}}
+    {COUNT, plural, =1 {a video} other {# videos}}
   </message>
   <message name="IDS_NEARBY_SECURE_CONNECTION_ID" desc="Description shown on both sender and receiver devices, to remind users to verify/compare tokens on both devices for security before sending/receiving data.">
     Secure connection ID: <ph name="TOKEN">$1<ex>1234</ex></ph>
@@ -184,19 +184,19 @@
     {COUNT, plural, =1 {Address} other {# addresses}}
   </message>
   <message name="IDS_NEARBY_TEXT_ATTACHMENTS_NOT_CAPITALIZED_ADDRESSES" desc="Describes one or more addresses being transfered via Nearby Share. Singular case is not capitalized, e.g. 'address'.">
-    {COUNT, plural, =1 {address} other {# addresses}}
+    {COUNT, plural, =1 {an address} other {# addresses}}
   </message>
   <message name="IDS_NEARBY_TEXT_ATTACHMENTS_CAPITALIZED_LINKS" desc="Describes one or more web links being transfered via Nearby Share. Singular case is capitalized, e.g. 'Link'.">
     {COUNT, plural, =1 {Link} other {# links}}
   </message>
   <message name="IDS_NEARBY_TEXT_ATTACHMENTS_NOT_CAPITALIZED_LINKS" desc="Describes one or more web links being transfered via Nearby Share. Singular case is not capitalized, e.g. 'link'.">
-    {COUNT, plural, =1 {link} other {# links}}
+    {COUNT, plural, =1 {a link} other {# links}}
   </message>
   <message name="IDS_NEARBY_TEXT_ATTACHMENTS_CAPITALIZED_PHONE_NUMBERS" desc="Describes one or more phone numbers being transfered via Nearby Share. Singular case is capitalized, e.g. 'Phone number'.">
     {COUNT, plural, =1 {Phone number} other {# phone numbers}}
   </message>
   <message name="IDS_NEARBY_TEXT_ATTACHMENTS_NOT_CAPITALIZED_PHONE_NUMBERS" desc="Describes one or more phone numbers being transfered via Nearby Share. Singular case is not capitalized, e.g. 'phone number'.">
-    {COUNT, plural, =1 {phone number} other {# phone numbers}}
+    {COUNT, plural, =1 {a phone number} other {# phone numbers}}
   </message>
   <message name="IDS_NEARBY_TEXT_ATTACHMENTS_CAPITALIZED_UNKNOWN" desc="Describes one or more pieces of text being transfered via Nearby Share. Singular case is capitalized, e.g. 'Text'.">
     {COUNT, plural, =1 {Text} other {# texts}}
@@ -208,7 +208,7 @@
     {COUNT, plural, =1 {Item} other {# items}}
   </message>
   <message name="IDS_NEARBY_NOT_CAPITALIZED_UNKNOWN_ATTACHMENTS" desc="Describes one or more items being transfered via Nearby Share. Singular case is not capitalized, e.g. 'item'.">
-    {COUNT, plural, =1 {item} other {# items}}
+    {COUNT, plural, =1 {an item} other {# items}}
   </message>
 
   <!-- High Visibility Page Strings -->

app/os_settings_strings.grdp

@@ -257,7 +257,7 @@
   <message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_INSTRUCTION_LOCATE_SCANNER_POWER_BUTTON" desc="Text in the add fingerprint dialog telling users to place finger on the power button which is the sensor.">
     Touch the power button with your finger
   </message>
-    <message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_INSTRUCTION_LOCATE_SCANNER_POWER_BUTTON_ARIA_LABEL" desc="Aria label in the add fingerprint dialog telling users that the fingerprint sensor is in the power button. Only visible by screen reader software.">
+  <message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_INSTRUCTION_LOCATE_SCANNER_POWER_BUTTON_ARIA_LABEL" desc="Aria label in the add fingerprint dialog telling users that the fingerprint sensor is in the power button. Only visible by screen reader software.">
     The fingerprint sensor is in the power button. Touch it lightly with any finger.
   </message>
   <message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_INSTRUCTION_LOCATE_SCANNER_KEYBOARD" desc="Text in the add fingerprint dialog telling users to place finger on the sensor on the keyboard.">
@@ -266,12 +266,18 @@
   <message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_INSTRUCTION_LOCATE_SCANNER_KEYBOARD_BOTTOM_LEFT_ARIA_LABEL" desc="Aria label in the add fingerprint dialog telling users that the fingerprint sensor is in the bottom left corner of the keyboard. Only visible by screen reader software.">
     The fingerprint sensor is the bottom left-hand key on your keyboard. Touch it lightly with any finger.
   </message>
-    <message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_INSTRUCTION_LOCATE_SCANNER_KEYBOARD_BOTTOM_RIGHT_ARIA_LABEL" desc="Aria label in the add fingerprint dialog telling users that the fingerprint sensor is in the bottom right corner of the keyboard. Only visible by screen reader software.">
+  <message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_INSTRUCTION_LOCATE_SCANNER_KEYBOARD_BOTTOM_RIGHT_ARIA_LABEL" desc="Aria label in the add fingerprint dialog telling users that the fingerprint sensor is in the bottom right corner of the keyboard. Only visible by screen reader software.">
     The fingerprint sensor is the bottom right-hand key on your keyboard. Touch it lightly with any finger.
   </message>
-    <message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_INSTRUCTION_LOCATE_SCANNER_KEYBOARD_TOP_RIGHT_ARIA_LABEL" desc="Aria label in the add fingerprint dialog telling users that the fingerprint sensor is in the top right corner of the keyboard. Only visible by screen reader software.">
+  <message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_INSTRUCTION_LOCATE_SCANNER_KEYBOARD_TOP_RIGHT_ARIA_LABEL" desc="Aria label in the add fingerprint dialog telling users that the fingerprint sensor is in the top right corner of the keyboard. Only visible by screen reader software.">
     The fingerprint sensor is the top right-hand key on your keyboard. Touch it lightly with any finger.
   </message>
+  <message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_INSTRUCTION_LOCATE_SCANNER_RIGHT_SIDE_ARIA_LABEL" desc="Aria label in the add fingerprint dialog telling users that the fingerprint sensor is in the right side of the chrome device. Only visible by screen reader software.">
+    The fingerprint sensor is on the right-hand side of your <ph name="DEVICE_TYPE">$1<ex>Bravebook</ex></ph>. Touch it lightly with any finger.
+  </message>
+  <message name="IDS_SETTINGS_ADD_FINGERPRINT_DIALOG_INSTRUCTION_LOCATE_SCANNER_LEFT_SIDE_ARIA_LABEL" desc="Aria label in the add fingerprint dialog telling users that the fingerprint sensor is in the left side of the chrome device. Only visible by screen reader software.">
+    The fingerprint sensor is on the left-hand side of your <ph name="DEVICE_TYPE">$1<ex>Bravebook</ex></ph>. Touch it lightly with any finger.
+  </message>
 
   <!-- Languages and Inputs (OS settings) -->
   <message name="IDS_OS_SETTINGS_LANGUAGES_AND_INPUT_PAGE_TITLE" desc="Name of the OS settings page which displays language and input method preferences.">

browser/ui/android/strings/android_chrome_strings.grd

@@ -568,6 +568,9 @@ CHAR-LIMIT guidelines:
       <message name="IDS_PASSWORD_ENTRY_EDIT_DELETION_DIALOG_BODY" desc="Text explaining the user that deleting the credential that they are viewing will not remove their account on the reaspective website.">
         Deleting this password will not delete your account on <ph name="SITE">%1$s<ex>example.com</ex></ph>
       </message>
+      <message name="IDS_PASSWORD_CHECK_DELETE_CREDENTIAL_DIALOG_BODY" desc="The body of a prompt to confirm that the user intends to delete the stored password.">
+        Deleting this password will not delete your account on <ph name="SITE">%1$s<ex>example.com</ex></ph>. Change your password or delete your account on <ph name="SITE">%1$s<ex>example.com</ex></ph> to keep it safe from others.
+      </message>
       <message name="IDS_PASSWORD_ENTRY_EDIT_DELETE_CREDENTIAL_DIALOG_TITLE" desc="The title of a prompt to confirm that the user intends to delete the stored password.">
         Delete password?
       </message>
@@ -1406,7 +1409,7 @@ Your Brave account may have other forms of browsing history like searches and ac
 
       <!-- Download later -->
       <message name="IDS_DOWNLOAD_LATER_DIALOG_TITLE" desc="Title of the download later dialog that let the user to choose the time to download.">
-        Choose when to download
+        Download later instead?
       </message>
       <message name="IDS_DOWNLOAD_LATER_DIALOG_SUBTITLE" desc="Subtitle of the download later dialog that let the user to choose the time to download.">
         You'll see a notification when this file is ready
@@ -1429,6 +1432,24 @@ Your Brave account may have other forms of browsing history like searches and ac
       <message name="IDS_DOWNLOAD_LATER_PROMPT_ENABLED_TITLE" desc="A setting text to ask whether to show a dialog about when to download.">
         Ask when to save files
       </message>
+      <message name="IDS_DOWNLOAD_LATER_SLOW_NETWORK_SUBTITLE" desc="A subtitle in the download later dialog to inform the user about slow network connection.">
+        Your <ph name="CONNECTION_TYPE">%1$s<ex>2G</ex></ph> connection might slow down your download
+      </message>
+      <message name="IDS_DOWNLOAD_LATER_2G_CONNECTION" desc="2G connection type.">
+        2G
+      </message>
+      <message name="IDS_DOWNLOAD_LATER_BLUETOOTH_CONNECTION" desc="Bluetooth connection type.">
+        Bluetooth
+      </message>
+      <message name="IDS_DOWNLOAD_LATER_WIFI_CONNECTION" desc="WIFI connection type.">
+        Wi-Fi
+      </message>
+      <message name="IDS_DOWNLOAD_LATER_LARGE_FILE_SUBTITLE" desc="A subtitle in the download later dialog to inform the user about large download file size.">
+        This file is large (<ph name="FILE_SIZE">%1$s<ex>300MB</ex></ph>)
+      </message>
+      <message name="IDS_DOWNLOAD_LATER_DIALOG_POSITIVE_BUTTON_TEXT" desc="The text of positive button on the download later dialog.">
+        Done
+      </message>
 
       <!-- Downloads location -->
       <message name="IDS_DOWNLOADS_LOCATION_SELECTOR_TITLE" desc="Title of the preference that allows the user to select which of the folders they would like to make the default location to save their downloads.">
@@ -2010,13 +2031,13 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
         <ph name="MESSAGE">%1$s<ex>Downloading file (200 MB)</ex></ph> <ph name="LINK_NAME">%2$s<ex>Details</ex></ph> button
       </message>
       <message name="IDS_DOWNLOAD_SCHEDULED_ON_WIFI" desc="Label describing that the download was scheduled to start on Wi-Fi.">
-        Download will start on Wi-Fi.
+        You’ll see a notification when this download starts on Wi-Fi.
       </message>
       <message name="IDS_DOWNLOAD_SCHEDULED_ON_DATE" desc="Label describing that the download was scheduled to start at a later date.">
-        Download will start on <ph name="date">%1$s<ex>Feb 28 2020</ex></ph>.
+        You’ll see a notification when this download starts on <ph name="date">%1$s<ex>Feb 28 2020</ex></ph>.
       </message>
       <message name="IDS_DOWNLOAD_SCHEDULED_ON_TIME" desc="Label describing that the download was scheduled to start at a later time.">
-        Download will start at <ph name="time">%1$s<ex>8:30PM</ex></ph>.
+        You’ll see a notification when this download starts at <ph name="time">%1$s<ex>8:30PM</ex></ph>.
       </message>
 
       <!-- Inline Update Infobar -->
@@ -3381,10 +3402,16 @@ Data from your Private session will only be cleared from Brave when you <ph name
         Refine: <ph name="REFINE_TEXT">%1$s<ex>The meaning of life</ex></ph>
       </message>
       <message name="IDS_ACCESSIBILITY_OMNIBOX_CONCEAL_CLIPBOARD_CONTENTS" desc="Content description for the omnibox clipboard conceal button.">
-        Conceal Clipboard Contents
+        Hide clipboard contents
       </message>
       <message name="IDS_ACCESSIBILITY_OMNIBOX_REVEAL_CLIPBOARD_CONTENTS" desc="Content description for the omnibox clipboard reveal button.">
-        Reveal Clipboard Contents
+        Show clipboard contents
+      </message>
+      <message name="IDS_ACCESSIBILITY_OMNIBOX_CONCEAL_BUTTON_ANNOUNCEMENT" desc="Accessibility announcement when the omnibox clipboard conceal button is clicked.">
+        Clipboard contents hidden
+      </message>
+      <message name="IDS_ACCESSIBILITY_OMNIBOX_REVEAL_BUTTON_ANNOUNCEMENT" desc="Accessibility announcement when the omnibox clipboard reveal button is clicked.">
+        Clipboard contents shown
       </message>
       <message name="IDS_ACCESSIBILITY_OMNIBOX_SWITCH_TO_TAB" desc="Content description for the omnibox switch to tab button.">
         Switch To Tab

components/arc_strings.grdp

@@ -3,7 +3,7 @@
 <grit-part>
   <!-- ARC app compatibility mode -->
   <message name="IDS_ASH_ARC_APP_COMPAT_RESIZE_CONFIRM_TITLE" desc="Dialog title that asks user if they want to enable resizing of the ARC application.">
-    Enable Maximizing?
+    Enable Resizing?
   </message>
   <message name="IDS_ASH_ARC_APP_COMPAT_RESIZE_CONFIRM_BODY" desc="Dialog body that asks user if they want to enable resizing of the ARC application.">
     This app is designed for mobile devices. It is running in a compatibility mode. Allow resizing might encounter issues including app restarting.
@@ -14,4 +14,16 @@
   <message name="IDS_ASH_ARC_APP_COMPAT_RESIZE_CONFIRM_DONT_ASK_ME" desc="Label for check box that prevents the dialog from being shown in the future">
     Don't ask me again for this app
   </message>
+  <message name="IDS_ARC_COMPAT_MODE_RESIZE_TOGGLE_MENU_PHONE" desc="Label for button to resize the window to phone size">
+    Phone
+  </message>
+  <message name="IDS_ARC_COMPAT_MODE_RESIZE_TOGGLE_MENU_TABLET" desc="Label for button to resize the window to tablet size">
+    Tablet
+  </message>
+  <message name="IDS_ARC_COMPAT_MODE_RESIZE_TOGGLE_MENU_DESKTOP" desc="Label for button to resize the window to desktop size">
+    Desktop
+  </message>
+  <message name="IDS_ARC_COMPAT_MODE_RESIZE_TOGGLE_MENU_RESIZE_SETTINGS" desc="Label for button to open resize settings">
+    Resize Settings
+  </message>
 </grit-part>

patches/base-BUILD.gn.patch

@@ -1,8 +1,8 @@
 diff --git a/base/BUILD.gn b/base/BUILD.gn
-index f9e098611a176e638be65297045a13425ab8c688..e22602bff119c8c3732ae5e834f55816053d1534 100644
+index acaff526ff2d8e1822dca295d7eed55ac8fa677d..dd6a801e83448b1d2c4f03aff94d3932393f7d02 100644
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
-@@ -3927,6 +3927,7 @@ if (is_android) {
+@@ -3936,6 +3936,7 @@ if (is_android) {
        "android/java/src/org/chromium/base/task/TaskTraits.java",
        "android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java",
      ]

patches/chrome-BUILD.gn.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index b7a01a6160b770ef25db0198b7e310c8a7bd8f95..0fcf8a77b9d5dbba2bd4086f1bf6a2a25e2dcd72 100644
+index 4573bd4fa051a9ea96b992ac425bd01cdfde76b1..59d81b7e54bdb92bff01a1b23e60a0e20b9452be 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
 @@ -169,6 +169,7 @@ if (!is_android && !is_mac) {
@@ -77,15 +77,15 @@ index b7a01a6160b770ef25db0198b7e310c8a7bd8f95..0fcf8a77b9d5dbba2bd4086f1bf6a2a2
 
      ldflags = [ "-Wl,-install_name,@executable_path/../Frameworks/$chrome_framework_name.framework/Versions/$chrome_version_full/$chrome_framework_name" ]
 
-@@ -1293,6 +1301,7 @@ if (is_win) {
+@@ -1297,6 +1305,7 @@ if (is_win) {
 
  group("browser_dependencies") {
    public_deps = [
 +    "//brave:browser_dependencies",
      "//build:branding_buildflags",
      "//build:chromeos_buildflags",
      "//chrome/app:shutdown_signal_handlers",
-@@ -1395,12 +1404,13 @@ group("child_dependencies") {
+@@ -1399,12 +1408,13 @@ group("child_dependencies") {
        # this is OK because all of content is linked into one library.
        "//content/browser",
      ]
@@ -100,7 +100,7 @@ index b7a01a6160b770ef25db0198b7e310c8a7bd8f95..0fcf8a77b9d5dbba2bd4086f1bf6a2a2
      output = "$target_gen_dir/chrome_exe_version.rc"
    }
 
-@@ -1454,6 +1464,7 @@ group("resources") {
+@@ -1458,6 +1468,7 @@ group("resources") {
      "//chrome/browser:resources",
      "//chrome/common:resources",
      "//chrome/renderer:resources",

patches/chrome-VERSION.patch

@@ -1,12 +1,12 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index 25eb5c98e6d91b16f4f21b3ac1327bcf5716b5ed..72888782328d9b51776d0ee69f4719447ef3d74f 100644
+index 9b3f6baacbcf3f6d2d1c0f81f83519566edca30e..72888782328d9b51776d0ee69f4719447ef3d74f 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=91
 -MINOR=0
 -BUILD=4472
--PATCH=19
+-PATCH=38
 +MINOR=1
 +BUILD=25
 +PATCH=62