Drop support for Android HTTP stack

All future releases will use the Chromium HTTP stack and maintaining two HTTP
stacks adds maintenance overhead. The Chromium HTTP stack requires V8, but we
now use V8 in all build targets (b/5495373), so we can safely drop the Android
HTTP stack.

See corresponding framework change
https://android-git.corp.google.com/g/166325.

Bug: 5495616
Change-Id: I41117b6750fbc1c84cbd4a5951b0d1a457354f93

3 files changed, 0 insertions, 38 deletions

diff --git a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
index 64799a8..c573b4e 100644
--- a/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
+++ b/Source/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
@@ -70,7 +70,6 @@
 #include "SkRect.h"
 #include "TextEncoding.h"
 #include "WebCoreFrameBridge.h"
-#include "WebCoreResourceLoader.h"
 #include "WebHistory.h"
 #include "WebIconDatabase.h"
 #include "WebFrameView.h"
diff --git a/Source/WebKit/android/WebCoreSupport/PlatformBridge.cpp b/Source/WebKit/android/WebCoreSupport/PlatformBridge.cpp
index 41c0222..8eb379a 100644
--- a/Source/WebKit/android/WebCoreSupport/PlatformBridge.cpp
+++ b/Source/WebKit/android/WebCoreSupport/PlatformBridge.cpp
@@ -71,49 +71,25 @@ String PlatformBridge::getSignedPublicKeyAndChallengeString(unsigned index, cons
 
 void PlatformBridge::setCookies(const Document* document, const KURL& url, const String& value)
 {
-#if USE(CHROME_NETWORK_STACK)
     std::string cookieValue(value.utf8().data());
     GURL cookieGurl(url.string().utf8().data());
     bool isPrivateBrowsing = document->settings() && document->settings()->privateBrowsingEnabled();
     WebCookieJar::get(isPrivateBrowsing)->cookieStore()->SetCookie(cookieGurl, cookieValue);
-#else
-    CookieClient* client = JavaSharedClient::GetCookieClient();
-    if (!client)
-        return;
-
-    client->setCookies(url, value);
-#endif
 }
 
 String PlatformBridge::cookies(const Document* document, const KURL& url)
 {
-#if USE(CHROME_NETWORK_STACK)
     GURL cookieGurl(url.string().utf8().data());
     bool isPrivateBrowsing = document->settings() && document->settings()->privateBrowsingEnabled();
     std::string cookies = WebCookieJar::get(isPrivateBrowsing)->cookieStore()->GetCookies(cookieGurl);
     String cookieString(cookies.c_str());
     return cookieString;
-#else
-    CookieClient* client = JavaSharedClient::GetCookieClient();
-    if (!client)
-        return String();
-
-    return client->cookies(url);
-#endif
 }
 
 bool PlatformBridge::cookiesEnabled(const Document* document)
 {
-#if USE(CHROME_NETWORK_STACK)
     bool isPrivateBrowsing = document->settings() && document->settings()->privateBrowsingEnabled();
     return WebCookieJar::get(isPrivateBrowsing)->allowCookies();
-#else
-    CookieClient* client = JavaSharedClient::GetCookieClient();
-    if (!client)
-        return false;
-
-    return client->cookiesEnabled();
-#endif
 }
 
 NPObject* PlatformBridge::pluginScriptableObject(Widget* widget)
@@ -171,15 +147,11 @@ int PlatformBridge::screenHeightInDocCoord(const WebCore::FrameView* frameView)
 
 String PlatformBridge::computeDefaultLanguage()
 {
-#if USE(CHROME_NETWORK_STACK)
     String acceptLanguages = WebRequestContext::acceptLanguage();
     size_t length = acceptLanguages.find(',');
     if (length == std::string::npos)
         length = acceptLanguages.length();
     return acceptLanguages.substring(0, length);
-#else
-    return "en";
-#endif
 }
 
 void PlatformBridge::updateViewport(FrameView* frameView)
diff --git a/Source/WebKit/android/WebCoreSupport/ResourceLoaderAndroid.cpp b/Source/WebKit/android/WebCoreSupport/ResourceLoaderAndroid.cpp
index 7f54810..92c39b8 100644
--- a/Source/WebKit/android/WebCoreSupport/ResourceLoaderAndroid.cpp
+++ b/Source/WebKit/android/WebCoreSupport/ResourceLoaderAndroid.cpp
@@ -29,7 +29,6 @@
 #include "Frame.h"
 #include "FrameLoaderClientAndroid.h"
 #include "WebCoreFrameBridge.h"
-#include "WebCoreResourceLoader.h"
 #include "WebUrlLoader.h"
 #include "WebViewCore.h"
 
@@ -42,18 +41,13 @@ PassRefPtr<ResourceLoaderAndroid> ResourceLoaderAndroid::start(
 {
     // Called on main thread
     FrameLoaderClientAndroid* clientAndroid = static_cast<FrameLoaderClientAndroid*>(client);
-#if USE(CHROME_NETWORK_STACK)
     WebViewCore* webViewCore = WebViewCore::getWebViewCore(clientAndroid->getFrame()->view());
     bool isMainFrame = !(clientAndroid->getFrame()->tree() && clientAndroid->getFrame()->tree()->parent());
     return WebUrlLoader::start(client, handle, request, isMainResource, isMainFrame, isSync, webViewCore->webRequestContext());
-#else
-    return clientAndroid->webFrame()->startLoadingResource(handle, request, isMainResource, isSync);
-#endif
 }
 
 bool ResourceLoaderAndroid::willLoadFromCache(const WebCore::KURL& url, int64_t identifier)
 {
-#if USE(CHROME_NETWORK_STACK)
     // This method is used to determine if a POST request can be repeated from
     // cache, but you cannot really know until you actually try to read from the
     // cache.  Even if we checked now, something else could come along and wipe
@@ -63,9 +57,6 @@ bool ResourceLoaderAndroid::willLoadFromCache(const WebCore::KURL& url, int64_t
     // reload.  Then in FrameLoaderClientImpl::dispatchWillSendRequest, we
     // fix-up the cache policy of the request to force a load from the cache.
     return true;
-#else
-    return WebCoreResourceLoader::willLoadFromCache(url, identifier);
-#endif
 }
 
 }