diff options
author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-29 08:18:17 +0000 |
---|---|---|
committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-29 08:18:17 +0000 |
commit | 33bc28352e9ac4f750163f15f10f2625d1e1256f (patch) | |
tree | 0fc85442a293ff21321543a03542a01000620b1b /content/shell/shell_url_request_context_getter.cc | |
parent | c488e1e6549cacff899d47d9515d211b725d502f (diff) | |
download | chromium_src-33bc28352e9ac4f750163f15f10f2625d1e1256f.zip chromium_src-33bc28352e9ac4f750163f15f10f2625d1e1256f.tar.gz chromium_src-33bc28352e9ac4f750163f15f10f2625d1e1256f.tar.bz2 |
Add ShellNetworkDelegate so content_shell can use cookies (again)
BUG=none
TEST=try to log in to some site using content_shell
Review URL: https://chromiumcodereview.appspot.com/9701023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129589 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/shell_url_request_context_getter.cc')
-rw-r--r-- | content/shell/shell_url_request_context_getter.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/content/shell/shell_url_request_context_getter.cc b/content/shell/shell_url_request_context_getter.cc index e8ff16c..4270006 100644 --- a/content/shell/shell_url_request_context_getter.cc +++ b/content/shell/shell_url_request_context_getter.cc @@ -7,6 +7,7 @@ #include "base/logging.h" #include "base/string_split.h" #include "content/public/browser/browser_thread.h" +#include "content/shell/shell_network_delegate.h" #include "net/base/cert_verifier.h" #include "net/base/default_server_bound_cert_store.h" #include "net/base/host_resolver.h" @@ -49,8 +50,9 @@ net::URLRequestContext* ShellURLRequestContextGetter::GetURLRequestContext() { if (!url_request_context_) { url_request_context_ = new net::URLRequestContext(); + network_delegate_.reset(new ShellNetworkDelegate); + url_request_context_->set_network_delegate(network_delegate_.get()); storage_.reset(new net::URLRequestContextStorage(url_request_context_)); - storage_->set_cookie_store(new net::CookieMonster(NULL, NULL)); storage_->set_server_bound_cert_service(new net::ServerBoundCertService( new net::DefaultServerBoundCertStore(NULL))); @@ -92,7 +94,7 @@ net::URLRequestContext* ShellURLRequestContextGetter::GetURLRequestContext() { "", // ssl_session_cache_shard url_request_context_->ssl_config_service(), url_request_context_->http_auth_handler_factory(), - NULL, // network_delegate + url_request_context_->network_delegate(), url_request_context_->http_server_properties(), NULL, main_backend); |