From 88e9af34fd490f7c0fc6a99cbb9508a839b1aa87 Mon Sep 17 00:00:00 2001 From: uazo Date: Wed, 9 Nov 2022 16:57:26 +0000 Subject: [PATCH] AUTOMATED - git apply results --- build/patches/00Add-AudioContextAPI-flags.patch | 4 ++-- ...Add-kill-switch-for-unsupported-clangd-flags.patch | 2 +- .../patches/Remove-signin-and-sync-integrations.patch | 11 ++++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/build/patches/00Add-AudioContextAPI-flags.patch b/build/patches/00Add-AudioContextAPI-flags.patch index 4db06df2..14cc400b 100644 --- a/build/patches/00Add-AudioContextAPI-flags.patch +++ b/build/patches/00Add-AudioContextAPI-flags.patch @@ -43,7 +43,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3217,6 +3217,15 @@ const char kWebrtcUseMinMaxVEADimensionsDescription[] = +@@ -3212,6 +3212,15 @@ const char kWebrtcUseMinMaxVEADimensionsDescription[] = "When enabled, WebRTC will only use the Video Encode Accelerator for " "video resolutions inside those published as supported."; @@ -62,7 +62,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1824,6 +1824,11 @@ extern const char kWebrtcSrtpAesGcmDescription[]; +@@ -1821,6 +1821,11 @@ extern const char kWebrtcSrtpAesGcmDescription[]; extern const char kWebrtcUseMinMaxVEADimensionsName[]; extern const char kWebrtcUseMinMaxVEADimensionsDescription[]; diff --git a/build/patches/Add-kill-switch-for-unsupported-clangd-flags.patch b/build/patches/Add-kill-switch-for-unsupported-clangd-flags.patch index 8a011ccc..02dd2082 100644 --- a/build/patches/Add-kill-switch-for-unsupported-clangd-flags.patch +++ b/build/patches/Add-kill-switch-for-unsupported-clangd-flags.patch @@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1554,6 +1554,11 @@ config("default_warnings") { +@@ -1558,6 +1558,11 @@ config("default_warnings") { # TODO(https://crbug.com/1363759): Evaluate and possibly enable. cflags += [ "-Wno-deprecated-copy-with-user-provided-copy" ] } diff --git a/build/patches/Remove-signin-and-sync-integrations.patch b/build/patches/Remove-signin-and-sync-integrations.patch index 79f35674..fa46d475 100644 --- a/build/patches/Remove-signin-and-sync-integrations.patch +++ b/build/patches/Remove-signin-and-sync-integrations.patch @@ -84,7 +84,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../browser/firstrun/MobileFreProgress.java | 4 +- .../router/discovery/access_code/BUILD.gn | 1 - .../browser/password_manager/android/BUILD.gn | 4 - - ...sswordManagerErrorMessageHelperBridge.java | 13 - + ...sswordManagerErrorMessageHelperBridge.java | 14 -- .../PasswordManagerHelper.java | 121 +-------- ...swordSyncControllerDelegateBridgeImpl.java | 7 - chrome/browser/privacy/BUILD.gn | 1 - @@ -120,7 +120,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../ProfileOAuth2TokenServiceDelegate.java | 52 ---- .../net/HttpNegotiateAuthenticator.java | 88 +------ .../chromoting/base/OAuthTokenFetcher.java | 2 - - 101 files changed, 91 insertions(+), 2555 deletions(-) + 101 files changed, 91 insertions(+), 2556 deletions(-) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn @@ -3588,7 +3588,7 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom import org.chromium.components.prefs.PrefService; import org.chromium.components.signin.AccountManagerFacadeProvider; import org.chromium.components.signin.base.CoreAccountInfo; -@@ -81,17 +80,5 @@ public class PasswordManagerErrorMessageHelperBridge { +@@ -91,18 +90,5 @@ public class PasswordManagerErrorMessageHelperBridge { */ @CalledByNative static void startUpdateAccountCredentialsFlow(WindowAndroid windowAndroid) { @@ -3596,8 +3596,9 @@ diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrom - final CoreAccountInfo primaryAccountInfo = - IdentityServicesProvider.get().getIdentityManager(profile).getPrimaryAccountInfo( - ConsentLevel.SIGNIN); -- // It's not possible to call updateCredentials without an account. -- assert primaryAccountInfo != null; +- // If the account has been removed before calling this method, there are no credentials to +- // update. +- if (primaryAccountInfo == null) return; - final Activity activity = windowAndroid.getActivity().get(); - AccountManagerFacadeProvider.getInstance().updateCredentials( - CoreAccountInfo.getAndroidAccountFrom(primaryAccountInfo), activity, (success) -> {