Upgrade from Chromium 114.0.5735.35 to Chromium 114.0.5735.53 (1.52.x) (

#18613) * Upgrade from Chromium 114.0.5735.35 to Chromium 114.0.5735.53 * Upgrade patches from Chromium 114.0.5735.35 to Chromium 114.0.5735.53 * Update pins list timestamp * [Android] Clean up code for BraveTabSwitcherModeTopToolbar.mToggleTabStackButton Chromium change: https://chromium.googlesource.com/chromium/src/+/d422158bc1109201e9ba59ef20b1d2285b58cc44 [A11y] Hide tab switcher button in a11y list tab switcher Hide tab switcher button in a11y list tab switcher. -Tab switcher toolbar no longer shows this button, so it's been removed. (cherry picked from commit 650061ccbc4dd02957c60aafa24f15a1c223cd72) Bug: 1445874 --------- Co-authored-by: brave-builds <[email protected]> Co-authored-by: Artem Samoilenko <[email protected]>
brave · May 26, 2023 · 7a9f84d · 7a9f84d
1 parent fd846da
commit 7a9f84d
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 28 deletions.
diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags
@@ -162,7 +162,6 @@
 -keep class org.chromium.chrome.browser.toolbar.top.TabSwitcherModeTopToolbar {
     *** mNewTabViewButton;
     *** mNewTabImageButton;
-    *** mToggleTabStackButton;
     *** mMenuButton;
     *** mShouldShowNewTabVariation;
     *** mIsIncognito;

diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTopToolbar.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTopToolbar.java
@@ -20,7 +20,6 @@ public class BraveTabSwitcherModeTopToolbar extends TabSwitcherModeTopToolbar {
     // To delete in bytecode, members from parent class will be used instead.
     private View mNewTabViewButton;
     private NewTabButton mNewTabImageButton;
-    private ToggleTabStackButton mToggleTabStackButton;
     private boolean mShouldShowNewTabVariation;
     private boolean mIsIncognito;
 
@@ -52,10 +51,6 @@ void onBottomToolbarVisibilityChanged(boolean isVisible) {
                 || (BottomToolbarConfiguration.isBottomToolbarEnabled()
                         && !BottomToolbarVariationManager.isNewTabButtonOnBottom());
         updateNewTabButtonVisibility();
-        // Show tab switcher button on the top in landscape mode.
-        if (BottomToolbarVariationManager.isTabSwitcherOnBottom() && !shouldShowIncognitoToggle()) {
-            mToggleTabStackButton.setVisibility(isVisible ? GONE : VISIBLE);
-        }
     }
 
     public int getToolbarColorForCurrentState() {

diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
@@ -911,9 +911,6 @@ public void testFieldsExist() throws Exception {
         Assert.assertTrue(
                 fieldExists("org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTopToolbar",
                         "mNewTabImageButton"));
-        Assert.assertTrue(
-                fieldExists("org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTopToolbar",
-                        "mToggleTabStackButton"));
         Assert.assertTrue(
                 fieldExists("org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTopToolbar",
                         "mShouldShowNewTabVariation"));

diff --git a/.../android/bytecode/java/org/brave/bytecode/BraveTabSwitcherModeTopToolbarClassAdapter.java b/.../android/bytecode/java/org/brave/bytecode/BraveTabSwitcherModeTopToolbarClassAdapter.java
@@ -22,9 +22,6 @@ public BraveTabSwitcherModeTopToolbarClassAdapter(ClassVisitor visitor) {
         deleteField(sBraveTabSwitcherModeTopToolbarClassName, "mNewTabImageButton");
         makeProtectedField(sTabSwitcherModeTopToolbarClassName, "mNewTabImageButton");
 
-        deleteField(sBraveTabSwitcherModeTopToolbarClassName, "mToggleTabStackButton");
-        makeProtectedField(sTabSwitcherModeTopToolbarClassName, "mToggleTabStackButton");
-
         deleteField(sBraveTabSwitcherModeTopToolbarClassName, "mShouldShowNewTabVariation");
         makeProtectedField(sTabSwitcherModeTopToolbarClassName, "mShouldShowNewTabVariation");
 

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
@@ -535,9 +535,9 @@ bool ParseCertificatesFile(base::StringPiece certs_input,
                            Pinsets* pinsets,
                            base::Time* timestamp) {
   constexpr base::StringPiece brave_certs = R"brave_certs(
-# Last updated: Tue May 23 21:01:04 UTC 2023
+# Last updated: Thu May 25 14:23:39 UTC 2023
 PinsListTimestamp
-1684875664
+1685024619
 
 # =====BEGIN BRAVE ROOTS ASC=====
 #From https://www.amazontrust.com/repository/

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

diff --git a/patches/build-util-android_chrome_version.py.patch b/patches/build-util-android_chrome_version.py.patch
@@ -1,8 +1,8 @@
 diff --git a/build/util/android_chrome_version.py b/build/util/android_chrome_version.py
-index b50847f4de283a0a409bd5abe5f32800e9083084..f099941b29bed1297888320dffd694a7338c056a 100755
+index 151081af209e7a6a7c37a43a0e67ef8444312f2f..76123c0bc0db215ff68ba810704ab6949e98e988 100755
 --- a/build/util/android_chrome_version.py
 +++ b/build/util/android_chrome_version.py
-@@ -314,7 +314,7 @@ def GenerateVersionCodes(version_values, arch, is_next_build):
+@@ -317,7 +317,7 @@ def GenerateVersionCodes(version_values, arch, is_next_build):
    """
 
    base_version_code = int(

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 8db16f3270ba55b29e5659533e29fd235d2571a6..35559aaeb6eaa7399ea1df66b10d4379966c4335 100644
+index 05ef6814510ae5853d9d4fe485661008a027f0ed..5344b7367bc93f26dda408a03e04700f1335ea45 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=114
 -MINOR=0
 -BUILD=5735
--PATCH=35
+-PATCH=53
 +MINOR=1
 +BUILD=52
 +PATCH=112
diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 6780e7770a9fea5578f923f6e7d4ba9778d39f3e..6e9d75382a5acc93daca20aa45f3563dac2daaa4 100644
+index acf48b7ffd061192c202893ebd1ba09b4df00187..bab4575d02295512e48707d155daa2807ae09d64 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
 @@ -2521,6 +2521,7 @@ static_library("browser") {

diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index 80fd65088b03dabcb528bc5e48917d4ee8e2dddc..8c3897698af6839abc2d9decd0201ef63558c45d 100644
+index e2d74e803159cd0895867bbef0c23bf425a6c0f9..a7f7bc9af381646525a93e9b6ba6a3783a980d7e 100644
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -3575,6 +3575,7 @@ const FeatureEntry::FeatureVariation kVcSegmentationModelVariations[] = {
+@@ -3568,6 +3568,7 @@ const FeatureEntry::FeatureVariation kVcSegmentationModelVariations[] = {
  //
  // When adding a new choice, add it to the end of the list.
  const FeatureEntry kFeatureEntries[] = {

diff --git a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch
@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-index 336a7ce60e66c242a1e693dc42a36a49197fda1a..68e311e67881492152e3bb412d97bf6d05517838 100644
+index 6d488e842bbd7a0961fe22654159bb5bb07d40c3..dacb57da75f75030b75cdd2896993c61ab307e57 100644
 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
 +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -3723,6 +3723,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
+@@ -3729,6 +3729,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
    policy_indicator::AddLocalizedStrings(html_source);
    AddSecurityKeysStrings(html_source);
 

diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 2da0d594ff4d14864da5ea7ee11b1b6fc552f8d6..4f3da6703c32d415cdb0647519a0ace2d8323b20 100644
+index d6515aedf07677dd10c85acecb17877b041abb7f..61ecba1bc1a84619a6679d1707ba429b88ce0798 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
 @@ -393,6 +393,7 @@ static_library("test_support") {

diff --git a/patches/content-browser-renderer_host-render_frame_host_impl.cc.patch b/patches/content-browser-renderer_host-render_frame_host_impl.cc.patch
@@ -1,5 +1,5 @@
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index a35d4592062ba764654cf30e7d8cea11139add00..81689644241c0e5edb28d1aa00b08e4a7fad4179 100644
+index 5afe83c262bcd2cc9dd93d22807ef1cf2350e583..952fa01f3820896023f24dbb4a23af3f1ead486e 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
 @@ -7832,6 +7832,8 @@ void RenderFrameHostImpl::CreateNewWindow(

diff --git a/patches/ios-chrome-app-BUILD.gn.patch b/patches/ios-chrome-app-BUILD.gn.patch
@@ -1,8 +1,8 @@
 diff --git a/ios/chrome/app/BUILD.gn b/ios/chrome/app/BUILD.gn
-index 508920d2f0c72e37c3bbd49d27e874b3861a11ff..cbc4fe1294abb0893fc29e332655e3f5e0eff3e6 100644
+index 46fef5204d987e135347a3b82f6790462b416629..c3f8db97eddfea3cefbca932a970dccdb0690e5e 100644
 --- a/ios/chrome/app/BUILD.gn
 +++ b/ios/chrome/app/BUILD.gn
-@@ -721,8 +721,7 @@ ios_app_bundle("chrome") {
+@@ -726,8 +726,7 @@ ios_app_bundle("chrome") {
    # (see https://crbug.com/1394553 for details of the build failure). This
    # is a stop-gap solution.
    if (target_environment == "catalyst" ||