Adaptations for Chromium 110

Pick-to: 6.6
Change-Id: I56e1695ee4fc2b0e12da6580a5673df80bba8b6d
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

2 files changed, 3 insertions, 15 deletions

diff --git a/src/core/net/proxying_restricted_cookie_manager_qt.cpp b/src/core/net/proxying_restricted_cookie_manager_qt.cpp
index 8608d35cd..d0c5b67de 100644
--- a/src/core/net/proxying_restricted_cookie_manager_qt.cpp
+++ b/src/core/net/proxying_restricted_cookie_manager_qt.cpp
@@ -68,14 +68,13 @@ void ProxyingRestrictedCookieManagerQt::GetAllForUrl(const GURL &url,
                                                      const net::SiteForCookies &site_for_cookies,
                                                      const url::Origin &top_frame_origin,
                                                      network::mojom::CookieManagerGetOptionsPtr options,
-                                                     bool partitioned_cookies_runtime_feature_enabled,
                                                      GetAllForUrlCallback callback)
 {
     DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
     if (allowCookies(url, site_for_cookies)) {
         underlying_restricted_cookie_manager_->GetAllForUrl(url, site_for_cookies, top_frame_origin, std::move(options),
-                                                            partitioned_cookies_runtime_feature_enabled, std::move(callback));
+                                                            std::move(callback));
     } else {
         std::move(callback).Run(std::vector<net::CookieWithAccessResult>());
     }
@@ -111,14 +110,13 @@ void ProxyingRestrictedCookieManagerQt::SetCookieFromString(const GURL &url,
                                                             const net::SiteForCookies &site_for_cookies,
                                                             const url::Origin &top_frame_origin,
                                                             const std::string &cookie,
-                                                            bool partitioned_cookies_runtime_feature_enabled,
                                                             SetCookieFromStringCallback callback)
 {
     DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
     if (allowCookies(url, site_for_cookies)) {
         underlying_restricted_cookie_manager_->SetCookieFromString(url, site_for_cookies, top_frame_origin, cookie,
-                                                                   partitioned_cookies_runtime_feature_enabled, std::move(callback));
+                                                                   std::move(callback));
     } else {
         std::move(callback).Run(false, false); // FIXME: is true, true in aw_proxying_restricted_cookie_manager.cc though..
     }
@@ -127,14 +125,13 @@ void ProxyingRestrictedCookieManagerQt::SetCookieFromString(const GURL &url,
 void ProxyingRestrictedCookieManagerQt::GetCookiesString(const GURL &url,
                                                          const net::SiteForCookies &site_for_cookies,
                                                          const url::Origin &top_frame_origin,
-                                                         bool partitioned_cookies_runtime_feature_enabled,
                                                          GetCookiesStringCallback callback)
 {
     DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
     if (allowCookies(url, site_for_cookies)) {
         underlying_restricted_cookie_manager_->GetCookiesString(url, site_for_cookies, top_frame_origin,
-                                                                partitioned_cookies_runtime_feature_enabled, std::move(callback));
+                                                                std::move(callback));
     } else {
         std::move(callback).Run("");
     }
@@ -149,11 +146,6 @@ void ProxyingRestrictedCookieManagerQt::CookiesEnabledFor(const GURL &url,
     std::move(callback).Run(allowCookies(url, site_for_cookies));
 }
 
-void ProxyingRestrictedCookieManagerQt::ConvertPartitionedCookiesToUnpartitioned(const GURL&)
-{
-    NOTIMPLEMENTED();
-}
-
 bool ProxyingRestrictedCookieManagerQt::allowCookies(const GURL &url, const net::SiteForCookies &site_for_cookies) const
 {
     if (!m_profileIoData)
diff --git a/src/core/net/proxying_restricted_cookie_manager_qt.h b/src/core/net/proxying_restricted_cookie_manager_qt.h
index 95e193f76..70b8499c0 100644
--- a/src/core/net/proxying_restricted_cookie_manager_qt.h
+++ b/src/core/net/proxying_restricted_cookie_manager_qt.h
@@ -28,7 +28,6 @@ public:
                       const net::SiteForCookies &site_for_cookies,
                       const url::Origin &top_frame_origin,
                       network::mojom::CookieManagerGetOptionsPtr options,
-                      bool partitioned_cookies_runtime_feature_enabled,
                       GetAllForUrlCallback callback) override;
     void SetCanonicalCookie(const net::CanonicalCookie& cookie,
                             const GURL &url,
@@ -45,18 +44,15 @@ public:
                              const net::SiteForCookies &site_for_cookies,
                              const url::Origin &top_frame_origin,
                              const std::string &cookie,
-                             bool partitioned_cookies_runtime_feature_enabled,
                              SetCookieFromStringCallback callback) override;
     void GetCookiesString(const GURL &url,
                           const net::SiteForCookies &site_for_cookies,
                           const url::Origin &top_frame_origin,
-                          bool partitioned_cookies_runtime_feature_enabled,
                           GetCookiesStringCallback callback) override;
     void CookiesEnabledFor(const GURL &url,
                            const net::SiteForCookies &site_for_cookies,
                            const url::Origin &top_frame_origin,
                            CookiesEnabledForCallback callback) override;
-    void ConvertPartitionedCookiesToUnpartitioned(const GURL&) override;
 
     // Internal:
     bool allowCookies(const GURL &url, const net::SiteForCookies &site_for_cookies) const;