Land Recent QUIC changes

net/tools/quic/quic_time_wait_list_manager.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/tools/quic/quic_time_wait_list_manager.h"
 
 #include <errno.h>
 
 #include "base/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 136 matching lines @@
   }
 
   return !is_write_blocked_;
 }
 
 void QuicTimeWaitListManager::OnError(QuicFramer* framer) {
   DLOG(INFO) << QuicUtils::ErrorToString(framer->error());
 }
 
 bool QuicTimeWaitListManager::OnProtocolVersionMismatch(
-    QuicVersionTag received_version) {
+    QuicTag received_version) {
   // Drop such packets whose version don't match.
   return false;
 }
 
 bool QuicTimeWaitListManager::OnStreamFrame(const QuicStreamFrame& frame) {
   return false;
 }
 
 bool QuicTimeWaitListManager::OnAckFrame(const QuicAckFrame& frame) {
   return false;
@@ skipping 131 matching lines @@
     // This guid has lived its age, retire it now.
     guid_map_.erase(oldest_guid->guid);
     time_ordered_guid_list_.pop_front();
     delete oldest_guid;
   }
   SetGuidCleanUpAlarm();
 }
 
 }  // namespace tools
 }  // namespace net