Implement pure virtual functions of NetworkDelegate

Instead of subclassing net::NetworkDelegateImpl and potentially
introduce silent behavior changes, use the common pattern of
implementing the pure virtual functions of the abstract base
class in our implementation of NetworkDelegateQt.

Change-Id: I54a22c60b0cfd54291515b9381535c5ce958efbf
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>

2 files changed, 114 insertions, 11 deletions

diff --git a/src/core/network_delegate_qt.cpp b/src/core/network_delegate_qt.cpp
index 4e726fec8..0d1b2b558 100644
--- a/src/core/network_delegate_qt.cpp
+++ b/src/core/network_delegate_qt.cpp
@@ -172,4 +172,92 @@ void NetworkDelegateQt::NotifyNavigationRequestedOnUIThread(net::URLRequest *req
                 );
 }
 
+bool NetworkDelegateQt::OnCanSetCookie(const net::URLRequest& request,
+                                       const std::string& cookie_line,
+                                       net::CookieOptions*)
+{
+    return true;
+}
+
+void NetworkDelegateQt::OnResolveProxy(const GURL&, int, const net::ProxyService&, net::ProxyInfo*)
+{
+}
+
+void NetworkDelegateQt::OnProxyFallback(const net::ProxyServer&, int)
+{
+}
+
+int NetworkDelegateQt::OnBeforeSendHeaders(net::URLRequest*, const net::CompletionCallback&, net::HttpRequestHeaders*)
+{
+    return net::OK;
+}
+
+void NetworkDelegateQt::OnBeforeSendProxyHeaders(net::URLRequest*, const net::ProxyInfo&, net::HttpRequestHeaders*)
+{
+}
+
+void NetworkDelegateQt::OnSendHeaders(net::URLRequest*, const net::HttpRequestHeaders&)
+{
+}
+
+int NetworkDelegateQt::OnHeadersReceived(net::URLRequest*, const net::CompletionCallback&, const net::HttpResponseHeaders*, scoped_refptr<net::HttpResponseHeaders>*, GURL*)
+{
+    return net::OK;
+}
+
+void NetworkDelegateQt::OnBeforeRedirect(net::URLRequest*, const GURL&)
+{
+}
+
+void NetworkDelegateQt::OnResponseStarted(net::URLRequest*)
+{
+}
+
+void NetworkDelegateQt::OnRawBytesRead(const net::URLRequest&, int)
+{
+}
+
+void NetworkDelegateQt::OnCompleted(net::URLRequest*, bool)
+{
+}
+
+void NetworkDelegateQt::OnPACScriptError(int, const base::string16&)
+{
+}
+
+net::NetworkDelegate::AuthRequiredResponse NetworkDelegateQt::OnAuthRequired(net::URLRequest*, const net::AuthChallengeInfo&, const AuthCallback&, net::AuthCredentials*)
+{
+    return AUTH_REQUIRED_RESPONSE_NO_ACTION;
+}
+
+bool NetworkDelegateQt::OnCanGetCookies(const net::URLRequest&, const net::CookieList&)
+{
+    return true;
+}
+
+bool NetworkDelegateQt::OnCanAccessFile(const net::URLRequest& request, const base::FilePath& path) const
+{
+    return true;
+}
+
+bool NetworkDelegateQt::OnCanThrottleRequest(const net::URLRequest&) const
+{
+    return false;
+}
+
+bool NetworkDelegateQt::OnCanEnablePrivacyMode(const GURL&, const GURL&) const
+{
+    return false;
+}
+
+bool NetworkDelegateQt::OnFirstPartyOnlyCookieExperimentEnabled() const
+{
+    return false;
+}
+
+bool NetworkDelegateQt::OnCancelURLRequestWithPolicyViolatingReferrerHeader(const net::URLRequest&, const GURL&, const GURL&) const
+{
+    return false;
+}
+
 } // namespace QtWebEngineCore
diff --git a/src/core/network_delegate_qt.h b/src/core/network_delegate_qt.h
index 825045642..7fbaf8c5a 100644
--- a/src/core/network_delegate_qt.h
+++ b/src/core/network_delegate_qt.h
@@ -37,24 +37,18 @@
 #ifndef NETWORK_DELEGATE_QT_H
 #define NETWORK_DELEGATE_QT_H
 
-#include "net/base/network_delegate_impl.h"
+#include "net/base/network_delegate.h"
 #include "net/base/net_errors.h"
 
 #include <QUrl>
 #include <QSet>
-#include <QtCore/qcompilerdetection.h> // Needed for Q_DECL_OVERRIDE
 
 namespace QtWebEngineCore {
 
-class NetworkDelegateQt : public net::NetworkDelegateImpl {
-public:
-    NetworkDelegateQt() {}
-    virtual ~NetworkDelegateQt() {}
 
-    // net::NetworkDelegate implementation
-    virtual int OnBeforeURLRequest(net::URLRequest* request, const net::CompletionCallback& callback, GURL* new_url) Q_DECL_OVERRIDE;
-    virtual void OnURLRequestDestroyed(net::URLRequest* request) Q_DECL_OVERRIDE;
-    virtual bool OnCanAccessFile(const net::URLRequest& request, const base::FilePath& path) const Q_DECL_OVERRIDE { return true; }
+class NetworkDelegateQt : public net::NetworkDelegate {
+    QSet<net::URLRequest *> m_activeRequests;
+public:
 
     struct RequestParams {
         QUrl url;
@@ -72,7 +66,28 @@ public:
                                       int navigationRequestAction,
                                       const net::CompletionCallback &callback);
 
-    QSet<net::URLRequest *> m_activeRequests;
+    // net::NetworkDelegate implementation
+    virtual int OnBeforeURLRequest(net::URLRequest* request, const net::CompletionCallback& callback, GURL* newUrl) override;
+    virtual void OnURLRequestDestroyed(net::URLRequest* request) override;
+    virtual bool OnCanSetCookie(const net::URLRequest&, const std::string&, net::CookieOptions*) override;
+    virtual void OnResolveProxy(const GURL&, int, const net::ProxyService&, net::ProxyInfo*) override;
+    virtual void OnProxyFallback(const net::ProxyServer&, int) override;
+    virtual int OnBeforeSendHeaders(net::URLRequest*, const net::CompletionCallback&, net::HttpRequestHeaders*) override;
+    virtual void OnBeforeSendProxyHeaders(net::URLRequest*, const net::ProxyInfo&, net::HttpRequestHeaders*) override;
+    virtual void OnSendHeaders(net::URLRequest*, const net::HttpRequestHeaders&) override;
+    virtual int OnHeadersReceived(net::URLRequest*, const net::CompletionCallback&, const net::HttpResponseHeaders*, scoped_refptr<net::HttpResponseHeaders>*, GURL*) override;
+    virtual void OnBeforeRedirect(net::URLRequest*, const GURL&) override;
+    virtual void OnResponseStarted(net::URLRequest*) override;
+    virtual void OnRawBytesRead(const net::URLRequest&, int) override;
+    virtual void OnCompleted(net::URLRequest*, bool) override;
+    virtual void OnPACScriptError(int, const base::string16&) override;
+    virtual net::NetworkDelegate::AuthRequiredResponse OnAuthRequired(net::URLRequest*, const net::AuthChallengeInfo&, const AuthCallback&, net::AuthCredentials*) override;
+    virtual bool OnCanGetCookies(const net::URLRequest&, const net::CookieList&) override;
+    virtual bool OnCanAccessFile(const net::URLRequest& request, const base::FilePath& path) const override;
+    virtual bool OnCanThrottleRequest(const net::URLRequest&) const override;
+    virtual bool OnCanEnablePrivacyMode(const GURL&, const GURL&) const override;
+    virtual bool OnFirstPartyOnlyCookieExperimentEnabled() const override;
+    virtual bool OnCancelURLRequestWithPolicyViolatingReferrerHeader(const net::URLRequest&, const GURL&, const GURL&) const override;
 };
 
 } // namespace QtWebEngineCore