1 files changed, 18 insertions, 22 deletions
diff --git a/Source/WebKit2/NetworkProcess/RemoteNetworkingContext.h b/Source/WebKit2/NetworkProcess/RemoteNetworkingContext.h
index e3ed12b90..d22fc9d67 100644
--- a/Source/WebKit2/NetworkProcess/RemoteNetworkingContext.h
+++ b/Source/WebKit2/NetworkProcess/RemoteNetworkingContext.h
@@ -28,50 +28,46 @@
 #define RemoteNetworkingContext_h
 
 #include <WebCore/NetworkingContext.h>
+#include <WebCore/SessionID.h>
 
 namespace WebKit {
 
 class RemoteNetworkingContext final : public WebCore::NetworkingContext {
 public:
-    static PassRefPtr<RemoteNetworkingContext> create(uint64_t sessionID, bool shouldClearReferrerOnHTTPSToHTTPRedirect)
+    static Ref<RemoteNetworkingContext> create(WebCore::SessionID sessionID, bool shouldClearReferrerOnHTTPSToHTTPRedirect)
     {
-        return adoptRef(new RemoteNetworkingContext(sessionID, shouldClearReferrerOnHTTPSToHTTPRedirect));
+        return adoptRef(*new RemoteNetworkingContext(sessionID, shouldClearReferrerOnHTTPSToHTTPRedirect));
     }
     virtual ~RemoteNetworkingContext();
 
     // FIXME: Remove platform-specific code and use SessionTracker.
-    static void ensurePrivateBrowsingSession(uint64_t sessionID);
+    static void ensurePrivateBrowsingSession(WebCore::SessionID);
 
-    virtual bool shouldClearReferrerOnHTTPSToHTTPRedirect() const override { return m_shouldClearReferrerOnHTTPSToHTTPRedirect; }
+    bool shouldClearReferrerOnHTTPSToHTTPRedirect() const override { return m_shouldClearReferrerOnHTTPSToHTTPRedirect; }
 
 private:
-    RemoteNetworkingContext(uint64_t sessionID, bool shouldClearReferrerOnHTTPSToHTTPRedirect)
+    RemoteNetworkingContext(WebCore::SessionID sessionID, bool shouldClearReferrerOnHTTPSToHTTPRedirect)
         : m_sessionID(sessionID)
         , m_shouldClearReferrerOnHTTPSToHTTPRedirect(shouldClearReferrerOnHTTPSToHTTPRedirect)
-#if PLATFORM(MAC)
-        , m_needsSiteSpecificQuirks(false)
-        , m_localFileContentSniffingEnabled(false)
-#endif
-    { }
+    {
+    }
 
-    virtual bool isValid() const override;
-    virtual WebCore::NetworkStorageSession& storageSession() const override;
+    bool isValid() const override;
+    WebCore::NetworkStorageSession& storageSession() const override;
 
-#if PLATFORM(MAC)
-    void setNeedsSiteSpecificQuirks(bool value) { m_needsSiteSpecificQuirks = value; }
-    virtual bool needsSiteSpecificQuirks() const override;
+#if PLATFORM(COCOA)
     void setLocalFileContentSniffingEnabled(bool value) { m_localFileContentSniffingEnabled = value; }
-    virtual bool localFileContentSniffingEnabled() const override;
-    virtual RetainPtr<CFDataRef> sourceApplicationAuditData() const override;
-    virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) const override;
+    bool localFileContentSniffingEnabled() const override;
+    RetainPtr<CFDataRef> sourceApplicationAuditData() const override;
+    String sourceApplicationIdentifier() const override;
+    WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) const override;
 #endif
 
-    uint64_t m_sessionID;
+    WebCore::SessionID m_sessionID;
     bool m_shouldClearReferrerOnHTTPSToHTTPRedirect;
 
-#if PLATFORM(MAC)
-    bool m_needsSiteSpecificQuirks;
-    bool m_localFileContentSniffingEnabled;
+#if PLATFORM(COCOA)
+    bool m_localFileContentSniffingEnabled = false;
 #endif
 };