Revert of Implement THROTTLED priority semantics.

net/http/http_network_transaction.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/http/http_network_transaction.h"
 
 #include <memory>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 575 matching lines @@
 
 void HttpNetworkTransaction::OnQuicBroken() {
   net_error_details_.quic_broken = true;
 }
 
 void HttpNetworkTransaction::GetConnectionAttempts(
     ConnectionAttempts* out) const {
   *out = connection_attempts_;
 }
 
-void HttpNetworkTransaction::OnThrottleUnblocked(
-    NetworkThrottleManager::Throttle* throttle) {
+void HttpNetworkTransaction::OnThrottleStateChanged() {
   // TODO(rdsmith): This DCHECK is dependent on the only transition
-  // being from blocked->unblocked.  That is true right now, but may not
+  // being from throttled->unthrottled.  That is true right now, but may not
   // be so in the future.
   DCHECK_EQ(STATE_THROTTLE_COMPLETE, next_state_);
 
   net_log_.EndEvent(NetLogEventType::HTTP_TRANSACTION_THROTTLED);
 
   DoLoop(OK);
 }
 
 bool HttpNetworkTransaction::IsSecureRequest() const {
   return request_->url.SchemeIsCryptographic();
@@ skipping 182 matching lines @@
         NOTREACHED() << "bad state";
         rv = ERR_FAILED;
         break;
     }
   } while (rv != ERR_IO_PENDING && next_state_ != STATE_NONE);
 
   return rv;
 }
 
 int HttpNetworkTransaction::DoThrottle() {
-  DCHECK(!throttle_);
   throttle_ = session_->throttler()->CreateThrottle(
       this, priority_, (request_->load_flags & LOAD_IGNORE_LIMITS) != 0);
   next_state_ = STATE_THROTTLE_COMPLETE;
 
-  if (throttle_->IsBlocked()) {
+  if (throttle_->IsThrottled()) {
     net_log_.BeginEvent(NetLogEventType::HTTP_TRANSACTION_THROTTLED);
     return ERR_IO_PENDING;
   }
 
   return OK;
 }
 
 int HttpNetworkTransaction::DoThrottleComplete() {
   DCHECK(throttle_);
-  DCHECK(!throttle_->IsBlocked());
+  DCHECK(!throttle_->IsThrottled());
 
   next_state_ = STATE_NOTIFY_BEFORE_CREATE_STREAM;
 
   return OK;
 }
 
 int HttpNetworkTransaction::DoNotifyBeforeCreateStream() {
   next_state_ = STATE_CREATE_STREAM;
   bool defer = false;
   if (!before_network_start_callback_.is_null())
@@ skipping 874 matching lines @@
   DCHECK(stream_request_);
 
   // Since the transaction can restart with auth credentials, it may create a
   // stream more than once. Accumulate all of the connection attempts across
   // those streams by appending them to the vector:
   for (const auto& attempt : stream_request_->connection_attempts())
     connection_attempts_.push_back(attempt);
 }
 
 }  // namespace net