Upgrade from Chromium 117.0.5938.92 to Chromium 117.0.5938.140 (1.59.…

…x) (#20321) * Upgrade from Chromium 117.0.5938.92 to Chromium 117.0.5938.140 * Upgrade patches from Chromium 117.0.5938.92 to Chromium 117.0.5938.140 * Update pins list timestamp * Updated strings for Chromium 117.0.5938.140 --------- Co-authored-by: brave-builds <[email protected]>
brave · Sep 28, 2023 · 1db8454 · 1db8454
1 parent fcd07f9
commit 1db8454
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 16 deletions.
diff --git a/app/generated_resources.grd b/app/generated_resources.grd
@@ -7468,6 +7468,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_NTP_MODULES_DRIVE_SENTENCE" desc="Name of the Drive module in sentence case shown in various UIs.">
         Google Drive files
       </message>
+      <message name="IDS_NTP_MODULES_DRIVE_SENTENCE_V2" desc="Name of the Drive module v2 in sentence case shown in various UIs." translateable="false">
+        Drive
+      </message>
       <message name="IDS_NTP_MODULES_DRIVE_SENTENCE2" desc="Variant of the name of the Drive module in sentence case shown in various UIs.">
         Drive files
       </message>

diff --git a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc
@@ -541,9 +541,9 @@ bool ParseCertificatesFile(base::StringPiece certs_input,
                            Pinsets* pinsets,
                            base::Time* timestamp) {
   constexpr base::StringPiece brave_certs = R"brave_certs(
-# Last updated: Thu Sep 21 23:25:49 UTC 2023
+# Last updated: Thu Sep 28 01:19:38 UTC 2023
 PinsListTimestamp
-1695338749
+1695863978
 
 # =====BEGIN BRAVE ROOTS ASC=====
 #From https://www.amazontrust.com/repository/

diff --git a/package.json b/package.json
@@ -267,7 +267,7 @@
     "projects": {
       "chrome": {
         "dir": "src",
-        "tag": "117.0.5938.92",
+        "tag": "117.0.5938.140",
         "repository": {
           "url": "https://github.com/brave/chromium"
         }

diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch
@@ -1,12 +1,12 @@
 diff --git a/chrome/VERSION b/chrome/VERSION
-index ce84aab37d587593f77c8467a1a3c938805d5e0b..56661ea3ec97b6098f3692ee1c65a34c2d1653e1 100644
+index 47d5ae69069ec0a3cef96c046d9a8ddbd12e6b3a..86a5dcfe1c77b9a8e81c5ef15a8f0286144cb68e 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=117
 -MINOR=0
 -BUILD=5938
--PATCH=92
+-PATCH=140
 +MINOR=1
 +BUILD=59
 +PATCH=101
diff --git a/patches/chrome-browser-download-download_target_determiner.cc.patch b/patches/chrome-browser-download-download_target_determiner.cc.patch
@@ -1,16 +1,16 @@
 diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc
-index 4aa1c174727044c92f8bf772c49c17d162d4dc25..d02a39cf83cd6e421f0642b981f10b4b6b4688dc 100644
+index e1364680133e0ad91167fd7977a660208a03a788..9716f3d44e959e0989b0cee8ae7592b290be1777 100644
 --- a/chrome/browser/download/download_target_determiner.cc
 +++ b/chrome/browser/download/download_target_determiner.cc
-@@ -1256,6 +1256,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel(
+@@ -1259,6 +1259,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel(
    // contains malware.
    if (HasPromptedForPath() ||
        confirmation_reason_ != DownloadConfirmationReason::NONE ||
 +      BRAVE_DOWNLOAD_TARGET_DETERMINER_GET_DANGER_LEVEL
        !download_->GetForcedFilePath().empty())
      return DownloadFileType::NOT_DANGEROUS;
 
-@@ -1294,6 +1295,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel(
+@@ -1297,6 +1298,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel(
          ui::PAGE_TRANSITION_FROM_ADDRESS_BAR) != 0 ||
         (download_->HasUserGesture() && visits == VISITED_REFERRER)))
      return DownloadFileType::NOT_DANGEROUS;

diff --git a/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch b/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
-index b2e4d83bbcb482d8e37f12cd8c9a43cca1fa461a..7b2605bfae4a504e29be3efdba3b76a89cc87565 100644
+index eb5b7832627ac4d3f206307bd2c3cae5590f1db3..339c181b4cad64919205c33f9c520263284c9edd 100644
 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
 +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
 @@ -1120,6 +1120,7 @@ void BookmarkBarView::Layout() {

diff --git a/patches/chrome-browser-ui-views-side_panel-side_panel_coordinator.cc.patch b/patches/chrome-browser-ui-views-side_panel-side_panel_coordinator.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc b/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc
-index eac30a8386acea27f7b3133b0480d3ab65e1d5ab..a6747fa7c17671d52f1196131e490d6fcbe4bea4 100644
+index 6bd96578a1adc08b8efad794302f15c107580ff8..b4ff811c4364af9217524cb64d5be3e762e0e781 100644
 --- a/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc
 +++ b/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc
 @@ -247,6 +247,7 @@ SidePanelRegistry* SidePanelCoordinator::GetGlobalSidePanelRegistry(
@@ -10,7 +10,7 @@ index eac30a8386acea27f7b3133b0480d3ab65e1d5ab..a6747fa7c17671d52f1196131e490d6f
    if (entry_id.has_value()) {
      Show(SidePanelEntry::Key(entry_id.value()), open_trigger);
    } else {
-@@ -737,6 +738,7 @@ std::unique_ptr<views::View> SidePanelCoordinator::CreateHeader() {
+@@ -746,6 +747,7 @@ std::unique_ptr<views::View> SidePanelCoordinator::CreateHeader() {
            ChromeDistanceMetric::DISTANCE_SIDE_PANEL_HEADER_VECTOR_ICON_SIZE)));
    header_close_button->SetFocusBehavior(views::View::FocusBehavior::ALWAYS);
 

diff --git a/patches/chrome-installer-util-google_update_settings.cc.patch b/patches/chrome-installer-util-google_update_settings.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/installer/util/google_update_settings.cc b/chrome/installer/util/google_update_settings.cc
-index 8aa98ee44068cebe8c27f2bf7c6b3cf67a23b81e..299673a00a76304a33c59b943e0b26b154d94a6e 100644
+index 6e06ab8f05a17e167f7f5cfd7882fb50afb5e9fb..9647dbc388b7de27814e0684b1ea6c46217b1d00 100644
 --- a/chrome/installer/util/google_update_settings.cc
 +++ b/chrome/installer/util/google_update_settings.cc
-@@ -30,7 +30,11 @@ using base::win::RegKey;
+@@ -32,7 +32,11 @@ using base::win::RegKey;
  using installer::InstallationState;
 
  const wchar_t GoogleUpdateSettings::kPoliciesKey[] =
@@ -14,7 +14,7 @@ index 8aa98ee44068cebe8c27f2bf7c6b3cf67a23b81e..299673a00a76304a33c59b943e0b26b1
  const wchar_t GoogleUpdateSettings::kUpdatePolicyValue[] = L"UpdateDefault";
  const wchar_t GoogleUpdateSettings::kDownloadPreferencePolicyValue[] =
      L"DownloadPreference";
-@@ -42,6 +46,10 @@ const wchar_t GoogleUpdateSettings::kCheckPeriodOverrideMinutes[] =
+@@ -44,6 +48,10 @@ const wchar_t GoogleUpdateSettings::kCheckPeriodOverrideMinutes[] =
  const int GoogleUpdateSettings::kCheckPeriodOverrideMinutesMax =
      60 * 24 * 7 * 6;
 

diff --git a/patches/components-password_manager-core-browser-login_database.cc.patch b/patches/components-password_manager-core-browser-login_database.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/components/password_manager/core/browser/login_database.cc b/components/password_manager/core/browser/login_database.cc
-index 729330677790e17749b61acffe45e5c83fc3a766..c236962f44620da0c43c27c94b3cb9682010d012 100644
+index f3c88db37ef04f4866132a9871fb79422eb78900..f7550d7ed99c31c842f1777d6195d3b670713cbd 100644
 --- a/components/password_manager/core/browser/login_database.cc
 +++ b/components/password_manager/core/browser/login_database.cc
-@@ -2173,6 +2173,7 @@ FormRetrievalResult LoginDatabase::StatementToForms(
+@@ -2259,6 +2259,7 @@ FormRetrievalResult LoginDatabase::StatementToForms(
 
      EncryptionResult result = InitPasswordFormFromStatement(
          *statement, /*decrypt_and_fill_password_value=*/true, new_form.get());