Update the cookie code in platform/network to match
the code upstreamed in
https://bugs.webkit.org/show_bug.cgi?id=32559
diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index 46d9caa..1fdbcbb 100644
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -514,7 +514,7 @@
platform/network/ResourceRequestBase.cpp \
platform/network/ResourceResponseBase.cpp \
\
- platform/network/android/Cookie.cpp \
+ platform/network/android/CookieJarAndroid.cpp \
platform/network/android/NetworkStateNotifierAndroid.cpp \
platform/network/android/ResourceHandleAndroid.cpp \
platform/network/android/ResourceRequestAndroid.cpp \
diff --git a/WebCore/platform/network/android/AuthenticationChallenge.h b/WebCore/platform/network/android/AuthenticationChallenge.h
index e272d60..954bfd8 100644
--- a/WebCore/platform/network/android/AuthenticationChallenge.h
+++ b/WebCore/platform/network/android/AuthenticationChallenge.h
@@ -31,8 +31,6 @@
namespace WebCore {
-class ResourceHandle;
-
class AuthenticationChallenge : public AuthenticationChallengeBase {
};
diff --git a/WebCore/platform/network/android/Cookie.cpp b/WebCore/platform/network/android/CookieJarAndroid.cpp
similarity index 98%
rename from WebCore/platform/network/android/Cookie.cpp
rename to WebCore/platform/network/android/CookieJarAndroid.cpp
index c0b7c7b..ba4b5dc 100644
--- a/WebCore/platform/network/android/Cookie.cpp
+++ b/WebCore/platform/network/android/CookieJarAndroid.cpp
@@ -25,12 +25,12 @@
#include "config.h"
+#include "CookieJar.h"
+
#include "PlatformBridge.h"
namespace WebCore {
-class Document;
-
void setCookies(Document*, const KURL& url, const String& value)
{
PlatformBridge::setCookies(url, value);
