diff options
author | Kristian Monsen <kristianm@google.com> | 2010-08-05 05:54:31 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-05 05:54:31 -0700 |
commit | 86fe994e4e586ab0a91dff3bd5de4adfa1f12992 (patch) | |
tree | f5fff681161ee09b65a4d5c66d7a3f502c443e04 | |
parent | c9b19d84176598cb004f587943bf151b4301b69a (diff) | |
parent | 5576fd286bd13016a0e15739ce9d4d6e9ff145a3 (diff) | |
download | external_webkit-86fe994e4e586ab0a91dff3bd5de4adfa1f12992.zip external_webkit-86fe994e4e586ab0a91dff3bd5de4adfa1f12992.tar.gz external_webkit-86fe994e4e586ab0a91dff3bd5de4adfa1f12992.tar.bz2 |
Merge "More fixes after the merge, setting a proxy service."
-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); |