| Index: net/http/http_network_transaction.cc
|
| diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
|
| index 4d7539cce8db4623f41b3d50f43da206a8cfa167..14db1c6e5f1829149f9eb43d2b3b2a534299a5a9 100644
|
| --- a/net/http/http_network_transaction.cc
|
| +++ b/net/http/http_network_transaction.cc
|
| @@ -586,9 +586,10 @@ void HttpNetworkTransaction::GetConnectionAttempts(
|
| *out = connection_attempts_;
|
| }
|
|
|
| -void HttpNetworkTransaction::OnThrottleStateChanged() {
|
| +void HttpNetworkTransaction::OnThrottleStateChanged(
|
| + NetworkThrottleManager::Throttle* throttle) {
|
| // TODO(rdsmith): This DCHECK is dependent on the only transition
|
| - // being from throttled->unthrottled. That is true right now, but may not
|
| + // being from blocked->unblocked. That is true right now, but may not
|
| // be so in the future.
|
| DCHECK_EQ(STATE_THROTTLE_COMPLETE, next_state_);
|
|
|
| @@ -791,7 +792,7 @@ int HttpNetworkTransaction::DoThrottle() {
|
| this, priority_, (request_->load_flags & LOAD_IGNORE_LIMITS) != 0);
|
| next_state_ = STATE_THROTTLE_COMPLETE;
|
|
|
| - if (throttle_->IsThrottled()) {
|
| + if (throttle_->IsBlocked()) {
|
| net_log_.BeginEvent(NetLog::TYPE_HTTP_TRANSACTION_THROTTLED);
|
| return ERR_IO_PENDING;
|
| }
|
| @@ -801,7 +802,7 @@ int HttpNetworkTransaction::DoThrottle() {
|
|
|
| int HttpNetworkTransaction::DoThrottleComplete() {
|
| DCHECK(throttle_);
|
| - DCHECK(!throttle_->IsThrottled());
|
| + DCHECK(!throttle_->IsBlocked());
|
|
|
| next_state_ = STATE_NOTIFY_BEFORE_CREATE_STREAM;
|
|
|
|
|