diff options
| -rw-r--r-- | WebKit/android/WebCoreSupport/WebRequestContext.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/WebKit/android/WebCoreSupport/WebRequestContext.cpp b/WebKit/android/WebCoreSupport/WebRequestContext.cpp index a65b77b..e9ef24c 100644 --- a/WebKit/android/WebCoreSupport/WebRequestContext.cpp +++ b/WebKit/android/WebCoreSupport/WebRequestContext.cpp @@ -29,12 +29,13 @@ #include "JNIUtility.h" #include "jni.h" -#include "base/message_loop_proxy.h" -#include "chrome/browser/net/sqlite_persistent_cookie_store.h" -#include "net/base/cookie_monster.h" -#include "net/base/ssl_config_service.h" -#include "net/http/http_cache.h" -#include "net/http/http_network_layer.h" +#include <base/message_loop_proxy.h> +#include <chrome/browser/net/sqlite_persistent_cookie_store.h> +#include <net/base/cookie_monster.h> +#include <net/base/ssl_config_service.h> +#include <net/http/http_cache.h> +#include <net/http/http_network_layer.h> +#include <net/proxy/proxy_service.h> namespace { // TODO: Get uastring from webcore @@ -92,7 +93,7 @@ WebRequestContext* WebRequestContext::GetAndroidContext() 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(), 0, net::SSLConfigService::CreateSystemSSLConfigService(), 0, 0, 0, defaultBackend); + androidContext->http_transaction_factory_ = new net::HttpCache(androidContext->host_resolver(), net::ProxyService::CreateNull(), net::SSLConfigService::CreateSystemSSLConfigService(), 0, 0, 0, defaultBackend); scoped_refptr<SQLitePersistentCookieStore> cookieDb = new SQLitePersistentCookieStore(cookiePath); androidContext->cookie_store_ = new net::CookieMonster(cookieDb.get(), 0); |