Skip to content

Commit

Permalink
Merge pull request #15087 from brave/105.0.5195.127_master
Browse files Browse the repository at this point in the history
Upgrade from Chromium 105.0.5195.102 to Chromium 105.0.5195.127
  • Loading branch information
kjozwiak authored Sep 14, 2022
2 parents 90957e3 + 6cbf621 commit 02cc5bc
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ bool ParseCertificatesFile(base::StringPiece certs_input,
Pinsets* pinsets,
base::Time* timestamp) {
base::StringPiece brave_certs = R"brave_certs(
# Last updated: Fri Sep 2 18:32:22 UTC 2022
# Last updated: Tue Sep 13 18:04:00 UTC 2022
PinsListTimestamp
1662143542
1663092240
# =====BEGIN BRAVE ROOTS ASC=====
#From https://www.amazontrust.com/repository/
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@
"projects": {
"chrome": {
"dir": "src",
"tag": "105.0.5195.102",
"tag": "105.0.5195.127",
"repository": {
"url": "https://github.com/chromium/chromium"
}
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-VERSION.patch
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
diff --git a/chrome/VERSION b/chrome/VERSION
index b310bb8fac3cecf490b47a7b13ea8185ff07a4d2..438e2e36eebeb6dd6236a93de6ecbd9134618a15 100644
index c7b2d7decf390cc3044cb384d4e3d22f42d9352a..0527e148d9e188df85b32f489e09acd4ccac2a5e 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=105
-MINOR=0
-BUILD=5195
-PATCH=102
-PATCH=127
+MINOR=1
+BUILD=45
+PATCH=47
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index 72d811b043287157af9ce8f669ad485596b60330..680a17a45507b7bd160b837070c73ed1add3e516 100644
index e7e355af6fb92e3a4f7563442ac3fe453b1c3a71..54e3257d16920f90e8d0861f144d390823a6746b 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -1431,6 +1431,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL(
@@ -1433,6 +1433,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL(

// static
ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() {
Expand Down
1 change: 1 addition & 0 deletions test/filters/browser_tests.filter
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
-_/WebrtcLoggingPrivateApiStartEventLoggingTestFeatureAndPolicyEnabled.*
-AccessCodeCastHandlerBrowserTest.*
-AccessContextAuditBrowserTest.*
-AccessContextAuditSessionRestoreBrowserTest.*
-AccessibilityLabelsMenuObserverTest.*
Expand Down
4 changes: 4 additions & 0 deletions test/filters/unit_tests.filter
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
-AboutFlagsHistogramTest.*
-AboutFlagsTest.*
-AccessCodeCastDiscoveryInterfaceTest.SyncError
-AccessCodeCastFeatureTest.GetAccessCodeDeviceDurationPrefSwitchEnabled
-AccessCodeCastSinkServiceFactoryTest.PrefEnabledReturnsValidService
-AccessibilityCheckerTest.*
-ActiveTabDelegateTest.*
-ActiveTabTest.*
Expand Down Expand Up @@ -61,6 +63,8 @@
-BrowserUnitTest.*
-BrowserViewHostedAppTest.*
-BrowserViewTest.*
-CastDialogViewTest.AccessCodeEmptySinksSourcesAvailable
-CastDialogViewTest.ShowAccessCodeCastButtonEnabled
-CastHandlerTest.*
-CastMediaNotificationProducerTest.*
-CastToolbarButtonTest.*
Expand Down

0 comments on commit 02cc5bc

Please sign in to comment.