diff options
author | Kristian Monsen <kristianm@google.com> | 2010-08-26 10:41:44 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-26 10:41:44 -0700 |
commit | ae9569ae6f9fab34553804e7ca28168a63c327ea (patch) | |
tree | 24288369f8db997cf88878088db3ecde02f2fcce | |
parent | 5a45899b92b919e9315351e9e19a8507a9f871b7 (diff) | |
parent | 664ef7f459bd32d4a01255f64dcd963cd5c7b67d (diff) | |
download | external_webkit-ae9569ae6f9fab34553804e7ca28168a63c327ea.zip external_webkit-ae9569ae6f9fab34553804e7ca28168a63c327ea.tar.gz external_webkit-ae9569ae6f9fab34553804e7ca28168a63c327ea.tar.bz2 |
Merge "Create HttpAuthHandlerFactory to fix HTTP auth crashes."
-rw-r--r-- | WebKit/android/WebCoreSupport/WebRequestContext.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebKit/android/WebCoreSupport/WebRequestContext.cpp b/WebKit/android/WebCoreSupport/WebRequestContext.cpp index 1b7a5ee..9a8c9a0 100644 --- a/WebKit/android/WebCoreSupport/WebRequestContext.cpp +++ b/WebKit/android/WebCoreSupport/WebRequestContext.cpp @@ -35,6 +35,7 @@ #include <net/base/ssl_config_service.h> #include <net/http/http_cache.h> #include <net/http/http_network_layer.h> +#include <net/http/http_auth_handler_factory.h> #include <net/proxy/proxy_service.h> #include <wtf/text/CString.h> @@ -117,7 +118,7 @@ WebRequestContext* WebRequestContext::GetAndroidContextForPath(const char* cooki scoped_refptr<base::MessageLoopProxy> cacheMessageLoopProxy = base::MessageLoopProxy::CreateForCurrentThread(); // Todo: check if the context takes ownership of the cache net::HttpCache::DefaultBackend* defaultBackend = new net::HttpCache::DefaultBackend(net::DISK_CACHE, cachePath, 20 * 1024 * 1024, cacheMessageLoopProxy); - androidContext->http_transaction_factory_ = new net::HttpCache(androidContext->host_resolver(), net::ProxyService::CreateNull(), net::SSLConfigService::CreateSystemSSLConfigService(), 0, 0, 0, defaultBackend); + androidContext->http_transaction_factory_ = new net::HttpCache(androidContext->host_resolver(), net::ProxyService::CreateNull(), net::SSLConfigService::CreateSystemSSLConfigService(), net::HttpAuthHandlerFactory::CreateDefault(), 0, 0, defaultBackend); scoped_refptr<SQLitePersistentCookieStore> cookieDb = new SQLitePersistentCookieStore(cookiePath); |