Update Chromiumv5.12.0-beta1

Changes:
8e6f5751e5 Restore media::FFmpegGlue::InitializeFFmpeg()
0c8d188f16 Add x86 target support for gn
2a52817b6e Fix creation of 'x86' toolchain in gn
3a84c2a8bc Add support for modules limiting jumbo width
c69fdae9c7 BASELINE: Update Chromium to 69.0.3497.113
3a783ba38b Merge remote-tracking branch 'origin/upstream-master' into 69-based
a4ecaddc7c Remove missing symlink to gen from perfetto/ui/src
3f8994c671 [Backport] Use newer GrGLFunction based on templated function types rather than pointers.

Change-Id: Ibfe810c1c9b88e25e9093fbb2aa213249f1a77bf
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

1 files changed, 2 insertions, 3 deletions

diff --git a/src/core/net/network_delegate_qt.cpp b/src/core/net/network_delegate_qt.cpp
index 88ab1238a..ccc8cc0e5 100644
--- a/src/core/net/network_delegate_qt.cpp
+++ b/src/core/net/network_delegate_qt.cpp
@@ -281,13 +281,12 @@ void NetworkDelegateQt::OnCompleted(net::URLRequest */*request*/, bool /*started
 
 bool NetworkDelegateQt::OnCanSetCookie(const net::URLRequest& request,
                                        const net::CanonicalCookie & /*cookie*/,
-                                       net::CookieOptions*,
-                                       bool /*allowed_from_caller*/)
+                                       net::CookieOptions*)
 {
     return canSetCookies(request.site_for_cookies(), request.url(), std::string());
 }
 
-bool NetworkDelegateQt::OnCanGetCookies(const net::URLRequest& request, const net::CookieList&, bool /*allowed_from_caller*/)
+bool NetworkDelegateQt::OnCanGetCookies(const net::URLRequest& request, const net::CookieList&)
 {
     return canGetCookies(request.site_for_cookies(), request.url());
 }