diff options
author | tburkard@chromium.org <tburkard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-24 21:38:14 +0000 |
---|---|---|
committer | tburkard@chromium.org <tburkard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-24 21:38:14 +0000 |
commit | dc8313ade80a2e5b983e3994cf0e415662cdb222 (patch) | |
tree | 311c06cdcab63df97f9d906c0bd2579a1b49aaa7 /net/url_request/url_request_http_job.cc | |
parent | 545de6c7fbb40e93c5f8cae397b8d9dffaaadd1d (diff) | |
download | chromium_src-dc8313ade80a2e5b983e3994cf0e415662cdb222.zip chromium_src-dc8313ade80a2e5b983e3994cf0e415662cdb222.tar.gz chromium_src-dc8313ade80a2e5b983e3994cf0e415662cdb222.tar.bz2 |
Refactor CookieStore/CookieMonster
Make GetAllCookiesForURLAsync part of CookieStore, so that the most common
use cases do not need to know about CookieMonster any more.
R=erikwright@chromium.org, jam@chromium.org, mmenke@chromium.org
Review URL: https://codereview.chromium.org/198913002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259018 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request/url_request_http_job.cc')
-rw-r--r-- | net/url_request/url_request_http_job.cc | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc index 56fed93..8d93eea 100644 --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc @@ -24,7 +24,7 @@ #include "net/base/network_delegate.h" #include "net/base/sdch_manager.h" #include "net/cert/cert_status_flags.h" -#include "net/cookies/cookie_monster.h" +#include "net/cookies/cookie_store.h" #include "net/http/http_content_disposition.h" #include "net/http/http_network_session.h" #include "net/http/http_request_headers.h" @@ -550,15 +550,10 @@ void URLRequestHttpJob::AddCookieHeaderAndStart() { CookieStore* cookie_store = GetCookieStore(); if (cookie_store && !(request_info_.load_flags & LOAD_DO_NOT_SEND_COOKIES)) { - net::CookieMonster* cookie_monster = cookie_store->GetCookieMonster(); - if (cookie_monster) { - cookie_monster->GetAllCookiesForURLAsync( - request_->url(), - base::Bind(&URLRequestHttpJob::CheckCookiePolicyAndLoad, - weak_factory_.GetWeakPtr())); - } else { - CheckCookiePolicyAndLoad(CookieList()); - } + cookie_store->GetAllCookiesForURLAsync( + request_->url(), + base::Bind(&URLRequestHttpJob::CheckCookiePolicyAndLoad, + weak_factory_.GetWeakPtr())); } else { DoStartTransaction(); } |