1 files changed, 23 insertions, 22 deletions

diff --git a/src/core/net/network_delegate_qt.cpp b/src/core/net/network_delegate_qt.cpp
index 74db51d7d..551302291 100644
--- a/src/core/net/network_delegate_qt.cpp
+++ b/src/core/net/network_delegate_qt.cpp
@@ -39,13 +39,14 @@
 
 #include "network_delegate_qt.h"
 
-#include "browser_context_adapter.h"
+#include "profile_adapter.h"
+#include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_request_info.h"
 #include "cookie_monster_delegate_qt.h"
 #include "ui/base/page_transition_types.h"
-#include "url_request_context_getter_qt.h"
+#include "profile_io_data_qt.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request.h"
 #include "qwebengineurlrequestinfo.h"
@@ -102,13 +103,13 @@ public:
                            bool isMainFrameRequest,
                            int navigationType,
                            int frameTreeNodeId,
-                           const net::CompletionCallback &callback)
+                           net::CompletionOnceCallback callback)
         : m_request(request)
         , m_url(url)
         , m_isMainFrameRequest(isMainFrameRequest)
         , m_navigationType(navigationType)
         , m_frameTreeNodeId(frameTreeNodeId)
-        , m_callback(callback)
+        , m_callback(std::move(callback))
     {
         DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
@@ -172,7 +173,7 @@ private:
         content::BrowserThread::PostTask(
             content::BrowserThread::IO,
             FROM_HERE,
-            base::Bind(&URLRequestNotification::complete, base::Unretained(this), error));
+            base::BindOnce(&URLRequestNotification::complete, base::Unretained(this), error));
     }
 
     void complete(int error)
@@ -181,7 +182,7 @@ private:
 
         if (m_request) {
             if (m_request->status().status() != net::URLRequestStatus::CANCELED)
-                m_callback.Run(error);
+                std::move(m_callback).Run(error);
             m_request->RemoveUserData(UserData::key);
         }
 
@@ -195,22 +196,22 @@ private:
     bool m_isMainFrameRequest;
     int m_navigationType;
     int m_frameTreeNodeId;
-    net::CompletionCallback m_callback;
+    net::CompletionOnceCallback m_callback;
 };
 
 const char URLRequestNotification::UserData::key[] = "QtWebEngineCore::URLRequestNotification";
 
 } // namespace
 
-NetworkDelegateQt::NetworkDelegateQt(URLRequestContextGetterQt *requestContext)
-    : m_requestContextGetter(requestContext)
+NetworkDelegateQt::NetworkDelegateQt(ProfileIODataQt *data)
+    : m_profileIOData(data)
 {
 }
 
-int NetworkDelegateQt::OnBeforeURLRequest(net::URLRequest *request, const net::CompletionCallback &callback, GURL *newUrl)
+int NetworkDelegateQt::OnBeforeURLRequest(net::URLRequest *request, net::CompletionOnceCallback callback, GURL *newUrl)
 {
     Q_ASSERT(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-    Q_ASSERT(m_requestContextGetter);
+    Q_ASSERT(m_profileIOData);
 
     const content::ResourceRequestInfo *resourceInfo = content::ResourceRequestInfo::ForRequest(request);
 
@@ -224,7 +225,7 @@ int NetworkDelegateQt::OnBeforeURLRequest(net::URLRequest *request, const net::C
 
     const QUrl qUrl = toQt(request->url());
 
-    QWebEngineUrlRequestInterceptor* interceptor = m_requestContextGetter->m_requestInterceptor;
+    QWebEngineUrlRequestInterceptor* interceptor = m_profileIOData->requestInterceptor();
     if (interceptor) {
         QWebEngineUrlRequestInfoPrivate *infoPrivate = new QWebEngineUrlRequestInfoPrivate(toQt(resourceType),
                                                                                            toQt(navigationType),
@@ -264,7 +265,7 @@ int NetworkDelegateQt::OnBeforeURLRequest(net::URLRequest *request, const net::C
         resourceInfo->IsMainFrame(),
         navigationType,
         frameTreeNodeId,
-        callback
+        std::move(callback)
     );
 
     // We'll run the callback after we notified the UI thread.
@@ -298,17 +299,17 @@ bool NetworkDelegateQt::OnCanEnablePrivacyMode(const GURL &url, const GURL &site
 
 bool NetworkDelegateQt::canSetCookies(const GURL &first_party, const GURL &url, const std::string &cookie_line) const
 {
-    Q_ASSERT(m_requestContextGetter);
-    return m_requestContextGetter->m_cookieDelegate->canSetCookie(toQt(first_party), QByteArray::fromStdString(cookie_line), toQt(url));
+    Q_ASSERT(m_profileIOData);
+    return m_profileIOData->canSetCookie(toQt(first_party), QByteArray::fromStdString(cookie_line), toQt(url));
 }
 
 bool NetworkDelegateQt::canGetCookies(const GURL &first_party, const GURL &url) const
 {
-    Q_ASSERT(m_requestContextGetter);
-    return m_requestContextGetter->m_cookieDelegate->canGetCookies(toQt(first_party), toQt(url));
+    Q_ASSERT(m_profileIOData);
+    return m_profileIOData->canGetCookies(toQt(first_party), toQt(url));
 }
 
-int NetworkDelegateQt::OnBeforeStartTransaction(net::URLRequest *request, const net::CompletionCallback &callback, net::HttpRequestHeaders *headers)
+int NetworkDelegateQt::OnBeforeStartTransaction(net::URLRequest *, net::CompletionOnceCallback, net::HttpRequestHeaders *)
 {
     return net::OK;
 }
@@ -322,7 +323,7 @@ void NetworkDelegateQt::OnStartTransaction(net::URLRequest *request, const net::
 {
 }
 
-int NetworkDelegateQt::OnHeadersReceived(net::URLRequest*, const net::CompletionCallback&, const net::HttpResponseHeaders*, scoped_refptr<net::HttpResponseHeaders>*, GURL*)
+int NetworkDelegateQt::OnHeadersReceived(net::URLRequest*, net::CompletionOnceCallback, const net::HttpResponseHeaders*, scoped_refptr<net::HttpResponseHeaders>*, GURL*)
 {
     return net::OK;
 }
@@ -347,7 +348,7 @@ void NetworkDelegateQt::OnPACScriptError(int, const base::string16&)
 {
 }
 
-net::NetworkDelegate::AuthRequiredResponse NetworkDelegateQt::OnAuthRequired(net::URLRequest*, const net::AuthChallengeInfo&, const AuthCallback&, net::AuthCredentials*)
+net::NetworkDelegate::AuthRequiredResponse NetworkDelegateQt::OnAuthRequired(net::URLRequest*, const net::AuthChallengeInfo&, AuthCallback, net::AuthCredentials*)
 {
     return AUTH_REQUIRED_RESPONSE_NO_ACTION;
 }
@@ -372,9 +373,9 @@ bool NetworkDelegateQt::OnCanQueueReportingReport(const url::Origin& origin) con
     return false;
 }
 
-bool NetworkDelegateQt::OnCanSendReportingReport(const url::Origin& origin) const
+void NetworkDelegateQt::OnCanSendReportingReports(std::set<url::Origin> origins, base::OnceCallback<void(std::set<url::Origin>)> result_callback) const
 {
-    return false;
+    std::move(result_callback).Run(std::set<url::Origin>());
 }
 
 bool NetworkDelegateQt::OnCanSetReportingClient(const url::Origin& origin, const GURL& endpoint) const