Merge pull request #15166 from brave/106.0.5249.55_1.45.x

Upgrade from Chromium 106.0.5249.40 to Chromium 106.0.5249.55 (1.45.x)
brave · Sep 22, 2022 · 4468a4b · 4468a4b
2 parents 4567d76 + 303a9d0
commit 4468a4b
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
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
@@ -17,9 +17,9 @@ bool ParseCertificatesFile(base::StringPiece certs_input,
                            Pinsets* pinsets,
                            base::Time* timestamp) {
   base::StringPiece brave_certs = R"brave_certs(
-# Last updated: Thu Sep 15 17:40:32 UTC 2022
+# Last updated: Wed Sep 21 19:17:40 UTC 2022
 PinsListTimestamp
-1663263632
+1663787860
 
 # =====BEGIN BRAVE ROOTS ASC=====
 #From https://www.amazontrust.com/repository/

diff --git a/package.json b/package.json
@@ -258,7 +258,7 @@
     "projects": {
       "chrome": {
         "dir": "src",
-        "tag": "106.0.5249.40",
+        "tag": "106.0.5249.55",
         "repository": {
           "url": "https://github.com/chromium/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 49d93aece3335bf364a22d0103692a5b50126c36..e3e5570ec50483522f0d7569d2c8ccb64b7bf837 100644
+index 18ced00570abbfe634c319d76b374fcd1f8d70d1..e6dc5087ca4e2d724f27bdded522429d89ea26b9 100644
 --- a/chrome/VERSION
 +++ b/chrome/VERSION
 @@ -1,4 +1,4 @@
  MAJOR=106
 -MINOR=0
 -BUILD=5249
--PATCH=40
+-PATCH=55
 +MINOR=1
 +BUILD=45
 +PATCH=67
diff --git a/patches/chrome-browser-about_flags.cc.patch b/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 6cd4bb240c669f351f502a86a98f3645d8cc23b8..a919fa7959fa0c3abf26aa7fc84377c158b423bc 100644
+index 9a0c47ab605d708408e5df6500382837aa041d6b..257ab01f4cbd04b73907c59054917bc07e516884 100644
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
 @@ -3332,6 +3332,7 @@ const FeatureEntry::FeatureVariation

diff --git a/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch b/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch
@@ -1,16 +1,16 @@
 diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc
-index fd53f6db1ed7308b542b91ec6ffdc0a78bac6188..edfd0ad4621b38da43cdfa302d99aba16661f96f 100644
+index f1aee4a1a1b61391eae6f100f1cf9276d045c448..98983ed62c8628daa2aea0434d29e8db14fae90e 100644
 --- a/chrome/browser/ui/views/tabs/tab_strip.cc
 +++ b/chrome/browser/ui/views/tabs/tab_strip.cc
-@@ -473,6 +473,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext,
+@@ -475,6 +475,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext,
 
    std::vector<gfx::Rect> CalculateBoundsForDraggedViews(
        const std::vector<TabSlotView*>& views) override {
 +    BRAVE_CALCULATE_BOUNDS_FOR_DRAGGED_VIEWS
      DCHECK(!views.empty());
 
      std::vector<gfx::Rect> bounds;
-@@ -721,6 +722,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext,
+@@ -718,6 +719,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext,
          continue;
        }
 

diff --git a/patches/chrome-installer-mac-BUILD.gn.patch b/patches/chrome-installer-mac-BUILD.gn.patch
@@ -1,5 +1,5 @@
 diff --git a/chrome/installer/mac/BUILD.gn b/chrome/installer/mac/BUILD.gn
-index 3fdf2271b95d225eedaaa2291b3f524067c1eb48..601fe99d2c73e8c90238f21bbe57d1d03b822354 100644
+index 89ce1c434b67441884658decd6af57c246645ecb..5f9efe57b93ddcccd625887fb30ffc67a38ba3df 100644
 --- a/chrome/installer/mac/BUILD.gn
 +++ b/chrome/installer/mac/BUILD.gn
 @@ -18,7 +18,8 @@ group("mac") {

diff --git a/patches/third_party-blink-public-devtools_protocol-browser_protocol.pdl.patch b/patches/third_party-blink-public-devtools_protocol-browser_protocol.pdl.patch
@@ -1,8 +1,8 @@
 diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.pdl b/third_party/blink/public/devtools_protocol/browser_protocol.pdl
-index 89f9fe3345d6b701b65b9620e4e269015a3d6c9f..c3d08b435451f0fc1f8d6999bf0970c12f8dff1e 100644
+index bf0a4f220122b1c288b2606b28d4f27a7a07e9a8..d9c1784025a751b5fb8bb8a24f149ebddd6bd1f9 100644
 --- a/third_party/blink/public/devtools_protocol/browser_protocol.pdl
 +++ b/third_party/blink/public/devtools_protocol/browser_protocol.pdl
-@@ -7165,6 +7165,8 @@ domain Page
+@@ -7166,6 +7166,8 @@ domain Page
        web-share
        window-placement
        xr-spatial-tracking

diff --git a/...hird_party-blink-renderer-core-permissions_policy-permissions_policy_features.json5.patch b/...hird_party-blink-renderer-core-permissions_policy-permissions_policy_features.json5.patch
@@ -1,8 +1,8 @@
 diff --git a/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5 b/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5
-index 31d45afd16c3a7cb51e4edaccbd69e4f45509eee..090370f8e7dbf63c6f0360660c147d7c637ef780 100644
+index a97c905723c4f7fbe24989d9b62bc58bb986f42f..b18bc3c7bf6f7c3466e1b27774a5bc769cf64418 100644
 --- a/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5
 +++ b/third_party/blink/renderer/core/permissions_policy/permissions_policy_features.json5
-@@ -400,5 +400,13 @@
+@@ -401,5 +401,13 @@
        permissions_policy_name: "local-fonts",
        depends_on: ["FontAccess"],
      },