In components/cdm/renderer/android_key_systems.h the declaration of
AddAndroidWidevine is guarded by BUILDFLAG(ENABLE_WIDEVINE), but in
android_webview/renderer/aw_key_systems.cc it is used without the
guard. Instead of patching we can add an empty definition of the
same function in a chromium_src override for when
BUILDFLAG(ENABLE_WIDEVINE) is not true.
The API was changed in C78, but missed this instance of it because it
only happens in x64 build.
C78 change:
https://github.com/brave/brave-core/pull/3653/commits/fabfe6ca1f242316a8ce8136df70d66e25c0032b
Chromium change:
https://chromium.googlesource.com/chromium/src/+/b851acc052ee6a505d4f60fb9cc326c410b1285b
commit b851acc052ee6a505d4f60fb9cc326c410b1285b
Author: Lily Chen <chlily@chromium.org>
Date: Wed Aug 7 15:54:44 2019 +0000
Split server_time out of net::CookieOptions
CookieOptions had an optional server_time field, which was used for
clock skew adjustments when creating a cookie, and nothing else.
Since CanonicalCookie::Create no longer depends on the other fields of
CookieOptions, this CL replaces its CookieOptions argument with a
base::Optional<base::Time> server_time argument. The server_time field
is removed from CookieOptions because nothing else needs it. This does
mean that CookieStore::SetCookieWithOptionsAsync needs an additional
server_time argument since CookieOptions no longer includes it. But
that method needs to be removed anyways.
Mostly but not entirely mechanical changes. This should not change any
behavior.
Bug: 989098
bridiver