Update from https://crrev.com/316786

net/http/disk_cache_based_quic_server_info.cc

 // Copyright 2014 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/disk_cache_based_quic_server_info.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
@@ skipping 83 matching lines @@
     if (!wait_for_ready_callback_.is_null()) {
       RecordQuicServerInfoFailure(WAIT_FOR_DATA_READY_INVALID_ARGUMENT_FAILURE);
       return ERR_INVALID_ARGUMENT;
     }
     wait_for_ready_callback_ = callback;
   }
 
   return ERR_IO_PENDING;
 }
 
+void DiskCacheBasedQuicServerInfo::ResetWaitForDataReadyCallback() {
+  DCHECK(CalledOnValidThread());
+  wait_for_ready_callback_.Reset();
+}
+
 void DiskCacheBasedQuicServerInfo::CancelWaitForDataReadyCallback() {
   DCHECK(CalledOnValidThread());
 
   RecordQuicServerInfoStatus(QUIC_SERVER_INFO_WAIT_FOR_DATA_READY_CANCEL);
   if (!wait_for_ready_callback_.is_null()) {
     RecordLastFailure();
     wait_for_ready_callback_.Reset();
   }
 }
 
@@ skipping 375 matching lines @@
   } else if (backend_->GetCacheType() == net::MEMORY_CACHE) {
     UMA_HISTOGRAM_ENUMERATION("Net.QuicDiskCache.FailureReason.MemoryCache",
                               failure, NUM_OF_FAILURES);
   } else {
     UMA_HISTOGRAM_ENUMERATION("Net.QuicDiskCache.FailureReason.DiskCache",
                               failure, NUM_OF_FAILURES);
   }
 }
 
 }  // namespace net