Update to Chromium 74.0.3729.28

Fixes brave/brave-browser#3858

(redo of #2040 and #2044)

app/brave_strings.grd

@@ -906,10 +906,10 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@example.com</
 
       <if expr="not is_android">
         <message name="IDS_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_BUBBLE_TEXT" desc="The text of a bubble that confirms users allows integrating the accessibility labels service of Brave to Brave.">
-          If an image doesn’t have a useful description, Brave will try to provide one for you. Images are scanned by Brave. You can turn this off in settings at any time.
+          If an image doesn’t have a useful description, Brave will try to provide one for you. To create descriptions, images are sent to Brave. You can turn this off in settings at any time.
         </message>
         <message name="IDS_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_BUBBLE_TEXT_ONCE" desc="The text of a bubble that confirms users allows integrating the accessibility labels service of Brave to Brave just once.">
-          If an image doesn’t have a useful description, Brave will try to provide one for you. Images are scanned by Brave.
+          If an image doesn’t have a useful description, Brave will try to provide one for you. To create descriptions, images are sent to Brave.
         </message>
         <message name="IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TEXT" desc="The text of a bubble that confirms users allows integrating the spelling service of Brave to Brave.">
           Brave can provide smarter spell-checking by sending what you type in the browser to Brave servers, allowing you to use the same spell-checking technology used by Brave search.

app/generated_resources.grd

@@ -5282,6 +5282,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
         <message name="IDS_FEEDBACK_BLUETOOTH_LOGS_CHECKBOX" desc="Checkbox for including bluetooth logs">
           Attach <ph name="BEGIN_LINK">&lt;a href="#" id="bluetooth-logs-info-link"&gt;</ph>Bluetooth Logs<ph name="END_LINK">&lt;/a&gt;</ph> (Brave internal)
         </message>
+        <message name="IDS_FEEDBACK_ASSISTANT_LOGS_MESSAGE" desc="Message shown after user clicks on the assistant logs hyperlink">
+          This information helps us better understand your Assistant issue. It’s stored for up to 90 days and access is restricted to appropriate engineering and feedback teams.
+        </message>
         <message name="IDS_FEEDBACK_BLUETOOTH_LOGS_MESSAGE" desc="Message shown after user clicks on the bluetooth logs hyperlink">
           To better diagnose Bluetooth issues, Bravers can include additional Bluetooth logs with their feedback reports. When this option is checked, your report will include btsnoop and HCI logs from your current session, sanitized to remove as much PII as possible. Access to these logs will be restricted to managers of the Brave OS product group in Listnr. Logs will be purged after 90 days.
         </message>
@@ -5300,7 +5303,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
           </message>
         </if>
         <message name="IDS_FEEDBACK_INCLUDE_ASSISTANT_INFORMATION_CHKBOX" desc="Checkbox for including Assistant debug information in the feedback report">
-            Info to debug Assistant
+          Include recent Assistant history via Sherlog. This may include your identity, location, and debug info <ph name="BEGIN_LINK">&lt;a href="#" id="assistant-logs-info-link"&gt;</ph>Learn more<ph name="END_LINK">&lt;/a&gt;</ph>
         </message>
         <message name="IDS_FEEDBACK_ATTACH_FILE_NOTE" desc="Text for describing the maximum size for an attached file">
           File will be sent to Brave for debugging

patches/chrome-VERSION.patch

@@ -1,11 +1,11 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index c297dd1238e78265f494b98c3df92e8babf1b659..5f20f645d150e8371a35edacace3d6b5c6232b89 100644
+index 9ef745ce1196c3f3fa9f6553702eb86e56e2f3c9..e7a554213e5df572b5b7413f77aa39e83649b9ab 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=74
  MINOR=0
 -BUILD=3729
--PATCH=22
+-PATCH=28
 +BUILD=64
 +PATCH=17

patches/chrome-browser-about_flags.cc.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index b7d1ed834546af82571f44f4ba0c1cacacaa6d07..916ade98f4016a149bc988d91a2fca1799dd437e 100644
+index 58400e87d875ea675310cd94c2269cf82f4af351..531c24c8b7324e746c5ac09457aa78d658028e03 100644
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
 @@ -261,14 +261,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {

patches/chrome-browser-resources-bookmarks-toolbar.html.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/bookmarks/toolbar.html b/chrome/browser/resources/bookmarks/toolbar.html
-index 715f1e9838b53108874d265b25d57ae204f47302..1a9459da4d8d85d0cbb0143aa9a2d47daf3ea151 100644
+index d6579e9783a4bcdeee441a3824fec30f754b93d5..2f807f8f6466bc65f28f52f62176c747f1ab8589 100644
 --- a/chrome/browser/resources/bookmarks/toolbar.html
 +++ b/chrome/browser/resources/bookmarks/toolbar.html
 @@ -1,7 +1,7 @@

patches/chrome-browser-resources-downloads-downloads.html.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/downloads/downloads.html b/chrome/browser/resources/downloads/downloads.html
-index 2397587630137c2085309b970da082a1a2ba39e8..4958faca16bea40aa4e6d879d5fd0abc1393ace8 100644
+index dcb81efa7c7e18d410a35e451d747060c496462f..a6ed97244e6b1af5b5fe485e58ae6e1ecc24ba90 100644
 --- a/chrome/browser/resources/downloads/downloads.html
 +++ b/chrome/browser/resources/downloads/downloads.html
 @@ -5,6 +5,7 @@

patches/chrome-browser-resources-downloads-toolbar.html.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/downloads/toolbar.html b/chrome/browser/resources/downloads/toolbar.html
-index f9b804f8fc9ba1cae31983f2298e79cab4ccf418..91bddad6b5175a87058c7f521c1eb82f64a5fa00 100644
+index 80fc546b5f2c9d33bef680172701d2feecc78252..7025217e758ce61ce4296cf24fb3671220f0d316 100644
 --- a/chrome/browser/resources/downloads/toolbar.html
 +++ b/chrome/browser/resources/downloads/toolbar.html
 @@ -3,7 +3,7 @@

patches/chrome-browser-resources-history-app.html.patch

@@ -1,16 +1,16 @@
 diff --git a/chrome/browser/resources/history/app.html b/chrome/browser/resources/history/app.html
-index 8579929ca2c3b7bd280ceb2953d0bcfbe111cf99..dd15a6f9f991c687a1c7bc2022cd849482cdf095 100644
+index 736edaf8f1d13ca634b95fd474bf53a06bdd20d6..031eeff954ccb6484a03e7af19205ccd3bbebd29 100644
 --- a/chrome/browser/resources/history/app.html
 +++ b/chrome/browser/resources/history/app.html
-@@ -96,6 +96,7 @@
+@@ -92,6 +92,7 @@
              query-result="[[queryResult_]]"
              path="history">
          </history-list>
 +<if expr=_google_chrome>
          <template is="dom-if" if="[[syncedTabsSelected_(selectedPage_)]]">
            <history-synced-device-manager id="synced-devices"
                session-list="[[queryResult_.sessionList]]"
-@@ -104,6 +105,7 @@
+@@ -100,6 +101,7 @@
                path="syncedTabs">
            </history-synced-device-manager>
          </template>

patches/chrome-browser-resources-md_extensions-extensions.html.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/md_extensions/extensions.html b/chrome/browser/resources/md_extensions/extensions.html
-index 42461d4e40d26889bce3aaa363c0992227aaa64e..cb5ddff7e494a64ffd0c0b5cb26df7be6f027c7e 100644
+index 088cee5cf802262eaaf5806d4b68ebc52a24f002..0945c0ff35a00d025e76bf6e967904b106ca0f26 100644
 --- a/chrome/browser/resources/md_extensions/extensions.html
 +++ b/chrome/browser/resources/md_extensions/extensions.html
 @@ -21,7 +21,7 @@
@@ -10,10 +10,10 @@ index 42461d4e40d26889bce3aaa363c0992227aaa64e..cb5ddff7e494a64ffd0c0b5cb26df7be
 +<if expr="_google_chrome">
      html.loading::before {
        background: var(--md-toolbar-color);
-       height: 56px;
+       height: var(--md-toolbar-height);
 @@ -43,7 +43,11 @@
      html[dark].loading.in-dev-mode body::before {
-       border-bottom: 1px solid rgba(255, 255, 255, .1);
+       border-bottom: var(--md-toolbar-border);
      }
 -
 +</if>

patches/chrome-browser-resources-md_extensions-toolbar.html.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/md_extensions/toolbar.html b/chrome/browser/resources/md_extensions/toolbar.html
-index 5e3eec9f88061e4670e54386066bd151bda1f651..63f154ef46ead9b8b9a05393d18aa9adbd7d8ecd 100644
+index 6f3b663fdf1dfe3098c39508f55cd74f9e7bb36e..6199623b0c4710b81ed59c19a5e9d8c6f75861f9 100644
 --- a/chrome/browser/resources/md_extensions/toolbar.html
 +++ b/chrome/browser/resources/md_extensions/toolbar.html
 @@ -2,7 +2,7 @@

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

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/settings.html b/chrome/browser/resources/settings/settings.html
-index 60fc7482f59c5376ba1b217327052a5a5eb32b92..9b761afb13c929006383b68e5154496f75784093 100644
+index c99aed2da137c1e9797c3775852701c955556202..c7be763fbac06633054143a88dd4faee1c14e90b 100644
 --- a/chrome/browser/resources/settings/settings.html
 +++ b/chrome/browser/resources/settings/settings.html
 @@ -8,6 +8,7 @@
@@ -10,7 +10,7 @@ index 60fc7482f59c5376ba1b217327052a5a5eb32b92..9b761afb13c929006383b68e5154496f
    <style>
      html {
        background: var(--md-background-color);
-@@ -25,6 +26,7 @@
+@@ -30,6 +31,7 @@
    <settings-ui></settings-ui>
    <link rel="stylesheet" href="chrome://resources/css/text_defaults_md.css">
    <link rel="import" href="chrome://resources/html/polymer.html">

patches/chrome-browser-resources-settings-settings_ui-settings_ui.html.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/resources/settings/settings_ui/settings_ui.html b/chrome/browser/resources/settings/settings_ui/settings_ui.html
-index 519cbc5b14489f62b82f49b5b6c7ae24ea31346a..5246f3abb18596802e61e496bb5436add2043768 100644
+index 372b651bd2607f37e5936f7259ba984d984920ab..d5f385106e10de3b88f9bbcd539a69982b864fcf 100644
 --- a/chrome/browser/resources/settings/settings_ui/settings_ui.html
 +++ b/chrome/browser/resources/settings/settings_ui/settings_ui.html
 @@ -2,7 +2,7 @@

patches/chrome-browser-ui-views-download-download_item_view.h.patch

@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/download/download_item_view.h b/chrome/browser/ui/views/download/download_item_view.h
-index daa83d3d0749754b7e485d33283cb2897dcb7f56..5f0a5f409668702af06fc58c5715057188a1c8fb 100644
+index 90842a870ada7b54b6d85e48eca7a98a73f0642b..f1cd0a0ad24914d3d61cc5674d368703871fb54b 100644
 --- a/chrome/browser/ui/views/download/download_item_view.h
 +++ b/chrome/browser/ui/views/download/download_item_view.h
 @@ -132,6 +132,7 @@ class DownloadItemView : public views::InkDropHostView,

patches/content-browser-BUILD.gn.patch

@@ -1,8 +1,8 @@
 diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
-index 9545cf4bb255c614260fc41a55cfaffe7e7d7420..72325f82e7b366de6da58663874b6192fcc6627f 100644
+index a17fee9e275e817f97e943a48e36fa9e67340c9d..7de443b32075e0c98a2f081d2b5de12492a689c5 100644
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
-@@ -2190,6 +2190,12 @@ jumbo_source_set("browser") {
+@@ -2192,6 +2192,12 @@ jumbo_source_set("browser") {
        "//ppapi/proxy:ipc",
        "//ppapi/shared_impl",
      ]

patches/content-browser-frame_host-navigation_request.cc.patch

@@ -1,8 +1,8 @@
 diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
-index 1b9bf70a102dc5b86e60d879617b343cb6573d98..a6ee05493be480e850ec8901508fd08e1013e775 100644
+index 5bca54fa888b7cf3b12f6882003ecb334e250f63..4f7c3b2f6da072886fd7bab972324dfb8d1695b9 100644
 --- a/content/browser/frame_host/navigation_request.cc
 +++ b/content/browser/frame_host/navigation_request.cc
-@@ -1578,6 +1578,11 @@ void NavigationRequest::OnStartChecksComplete(
+@@ -1581,6 +1581,11 @@ void NavigationRequest::OnStartChecksComplete(
    headers.MergeFrom(navigation_handle_->TakeModifiedRequestHeaders());
    begin_params_->headers = headers.ToString();
 

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 fe05073935772aa6b0383f648b470a57b5c97a12..eaf3952a346f17fbe6e47d9a5ecbd6a1fcc89c9e 100644
+index 352b7723bf3fce0313494569c05dfd262f71942c..d22331b16fc20e0b36607c133e36a596706f2690 100644
 --- a/tools/metrics/histograms/histograms.xml
 +++ b/tools/metrics/histograms/histograms.xml
-@@ -144129,6 +144129,7 @@ uploading your change for review.
+@@ -144152,6 +144152,7 @@ uploading your change for review.
    <suffix name="ProtectedMedia" label="Protected media permission"/>
    <suffix name="PushMessaging" label="Push messaging permission"/>
    <suffix name="Quota" label="Quota permission"/>

patches/ui-webui-resources-css-md_colors.css.patch

@@ -1,5 +1,5 @@
 diff --git a/ui/webui/resources/css/md_colors.css b/ui/webui/resources/css/md_colors.css
-index 28a2dc131539902d9b48cafb7ca359445e25fbab..4538d8b41863cd1fecfda6a6b510b7f702a95606 100644
+index 975052085abfcc8ceabf8aa8b929d14023a81cfe..00744e3ed2bfc0d8312d1e6a0597baefdcc797bc 100644
 --- a/ui/webui/resources/css/md_colors.css
 +++ b/ui/webui/resources/css/md_colors.css
 @@ -1,6 +1,7 @@