Index: net/url_request/url_request_http_job.cc |
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc |
index 68858c147586fc902d58c50f946829c46bf543e1..8531dd32ad350be963fbfa40c329545c2086ce12 100644 |
--- a/net/url_request/url_request_http_job.cc |
+++ b/net/url_request/url_request_http_job.cc |
@@ -9,7 +9,6 @@ |
#include "base/bind_helpers.h" |
#include "base/command_line.h" |
#include "base/compiler_specific.h" |
-#include "base/debug/alias.h" |
#include "base/file_version_info.h" |
#include "base/message_loop/message_loop.h" |
#include "base/metrics/field_trial.h" |
@@ -208,17 +207,10 @@ |
base::Unretained(this))), |
awaiting_callback_(false), |
http_user_agent_settings_(http_user_agent_settings), |
- transaction_state_(TRANSACTION_WAS_NOT_INITIALIZED), |
weak_factory_(this) { |
URLRequestThrottlerManager* manager = request->context()->throttler_manager(); |
if (manager) |
throttling_entry_ = manager->RegisterRequestUrl(request->url()); |
- |
- // TODO(battre) Remove this overriding once crbug.com/289715 has been |
- // resolved. |
- on_headers_received_callback_ = |
- base::Bind(&URLRequestHttpJob::OnHeadersReceivedCallbackForDebugging, |
- weak_factory_.GetWeakPtr()); |
ResetTimer(); |
} |
@@ -415,7 +407,6 @@ |
DoneWithRequest(ABORTED); |
transaction_.reset(); |
- transaction_state_ = TRANSACTION_WAS_DESTROYED; |
response_info_ = NULL; |
receive_headers_end_ = base::TimeTicks(); |
} |
@@ -477,8 +468,6 @@ |
rv = request_->context()->http_transaction_factory()->CreateTransaction( |
priority_, &transaction_); |
- if (rv == OK) |
- transaction_state_ = TRANSACTION_WAS_INITIALIZED; |
if (rv == OK && request_info_.url.SchemeIsWSOrWSS()) { |
base::SupportsUserData::Data* data = request_->GetUserData( |
@@ -944,19 +933,6 @@ |
} |
} |
-// TODO(battre) Use URLRequestHttpJob::OnHeadersReceivedCallback again, once |
-// crbug.com/289715 has been resolved. |
-// static |
-void URLRequestHttpJob::OnHeadersReceivedCallbackForDebugging( |
- base::WeakPtr<net::URLRequestHttpJob> job, |
- int result) { |
- CHECK(job.get()); |
- net::URLRequestHttpJob::TransactionState state = job->transaction_state_; |
- base::debug::Alias(&state); |
- CHECK(job->transaction_.get()); |
- job->OnHeadersReceivedCallback(result); |
-} |
- |
void URLRequestHttpJob::OnHeadersReceivedCallback(int result) { |
awaiting_callback_ = false; |