commit 558790d6acca3451cf3a6b497803a5f07d0bec58
author Ben Murdoch <benm@google.com> Tue Jul 30 15:19:42 2013 +0100
committer Ben Murdoch <benm@google.com> Tue Jul 30 15:19:42 2013 +0100
tree fcc36c3da74559ee6015cb5e9f596105cdc9f56e
parent 8643c35ec8e6546ae6e04c51e08c4d57d40e88da

Merge from Chromium at DEPS revision r214332

This commit was generated by merge_to_master.py.

Change-Id: I82a7c38de906244dc882493568013be659aa65d1

net/quic/quic_connection_logger.h

diff --git a/net/quic/quic_connection_logger.h b/net/quic/quic_connection_logger.h
index 81a5441..1d2bd2d 100644
--- a/net/quic/quic_connection_logger.h
+++ b/net/quic/quic_connection_logger.h
@@ -32,7 +32,7 @@
   virtual void OnPacketReceived(const IPEndPoint& self_address,
                                 const IPEndPoint& peer_address,
                                 const QuicEncryptedPacket& packet) OVERRIDE;
-  virtual void OnProtocolVersionMismatch(QuicTag version) OVERRIDE;
+  virtual void OnProtocolVersionMismatch(QuicVersion version) OVERRIDE;
   virtual void OnPacketHeader(const QuicPacketHeader& header) OVERRIDE;
   virtual void OnStreamFrame(const QuicStreamFrame& frame) OVERRIDE;
   virtual void OnAckFrame(const QuicAckFrame& frame) OVERRIDE;