Speculative fix for crashes related to CookieStoreProxy on Windows (issue #591).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/963@615 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2012-05-03 20:59:30 +00:00
parent 4ee46079b6
commit 4d0a87ae47

View File

@ -176,7 +176,7 @@ class CefUrlRequestJob : public net::URLRequestJob {
if (!request_)
return;
net::CookieStore* cookie_store =
scoped_refptr<net::CookieStore> cookie_store =
request_->context()->cookie_store();
if (cookie_store) {
net::CookieMonster* cookie_monster = cookie_store->GetCookieMonster();
@ -196,10 +196,14 @@ class CefUrlRequestJob : public net::URLRequestJob {
void DoLoadCookies() {
net::CookieOptions options;
options.set_include_httponly();
request_->context()->cookie_store()->GetCookiesWithInfoAsync(
request_->url(), options,
base::Bind(&CefUrlRequestJob::OnCookiesLoaded,
weak_factory_.GetWeakPtr()));
scoped_refptr<net::CookieStore> cookie_store =
request_->context()->cookie_store();
if (cookie_store) {
cookie_store->GetCookiesWithInfoAsync(
request_->url(), options,
base::Bind(&CefUrlRequestJob::OnCookiesLoaded,
weak_factory_.GetWeakPtr()));
}
}
void CheckCookiePolicyAndLoad(
@ -414,10 +418,14 @@ class CefUrlRequestJob : public net::URLRequestJob {
options.set_include_httponly();
if (CanSetCookie(
response_cookies_[response_cookies_save_index_], &options)) {
request_->context()->cookie_store()->SetCookieWithOptionsAsync(
request_->url(), response_cookies_[response_cookies_save_index_],
options, base::Bind(&CefUrlRequestJob::OnCookieSaved,
weak_factory_.GetWeakPtr()));
scoped_refptr<net::CookieStore> cookie_store =
request_->context()->cookie_store();
if (cookie_store) {
cookie_store->SetCookieWithOptionsAsync(
request_->url(), response_cookies_[response_cookies_save_index_],
options, base::Bind(&CefUrlRequestJob::OnCookieSaved,
weak_factory_.GetWeakPtr()));
}
return;
}