diff options
| author | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-19 20:48:15 +0000 |
|---|---|---|
| committer | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-19 20:48:15 +0000 |
| commit | 36772954a95f88199d63dfd2e2d657bb2f2342b4 (patch) | |
| tree | 7c9c5b1b587cca5383a57b52806446c5eb1c3ec1 /net/url_request | |
| parent | 4ffd566b3d1510c33fbdc864218393a5f192e945 (diff) | |
| download | chromium_src-36772954a95f88199d63dfd2e2d657bb2f2342b4.zip chromium_src-36772954a95f88199d63dfd2e2d657bb2f2342b4.tar.gz chromium_src-36772954a95f88199d63dfd2e2d657bb2f2342b4.tar.bz2 | |
Revert 66722 - This prevents crashes due to URLRequestHttpJobs hanging on past IOThread
destruction.
BUG=chromium-os:8179,63692,63796
TEST=sync integration tests
Review URL: http://codereview.chromium.org/5163004
For revert info, see bug 63796.
TBR=akalin@chromium.org
Review URL: http://codereview.chromium.org/5144006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66813 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request')
| -rw-r--r-- | net/url_request/url_request_http_job.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc index f00f490..a3e88ab 100644 --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc @@ -77,6 +77,7 @@ URLRequestJob* URLRequestHttpJob::Factory(URLRequest* request, URLRequestHttpJob::URLRequestHttpJob(URLRequest* request) : URLRequestJob(request), + context_(request->context()), response_info_(NULL), response_cookies_save_index_(0), proxy_auth_state_(net::AUTH_STATE_DONT_NEED_AUTH), @@ -608,7 +609,6 @@ void URLRequestHttpJob::DestroyTransaction() { transaction_.reset(); response_info_ = NULL; - context_ = NULL; } void URLRequestHttpJob::StartTransaction() { @@ -631,9 +631,6 @@ void URLRequestHttpJob::StartTransaction() { if (rv == net::OK) { rv = transaction_->Start( &request_info_, &start_callback_, request_->net_log()); - // Make sure the context is alive for the duration of the - // transaction. - context_ = request_->context(); } } |