Land Recent QUIC Changes.

net/quic/quic_stream_factory.h

 // 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.
 
 #ifndef NET_QUIC_QUIC_STREAM_FACTORY_H_
 #define NET_QUIC_QUIC_STREAM_FACTORY_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 73 matching lines @@
  public:
   QuicStreamFactory(
       HostResolver* host_resolver,
       ClientSocketFactory* client_socket_factory,
       base::WeakPtr<HttpServerProperties> http_server_properties,
       QuicCryptoClientStreamFactory* quic_crypto_client_stream_factory,
       QuicRandom* random_generator,
       QuicClock* clock,
       size_t max_packet_length,
       const QuicVersionVector& supported_versions);
-  virtual ~QuicStreamFactory();
+  virtual ~QuicStreamFactory() OVERRIDE;
 
   // Creates a new QuicHttpStream to |host_port_proxy_pair| which will be
   // owned by |request|. |is_https| specifies if the protocol is https or not.
   // |cert_verifier| is used by ProofVerifier for verifying the certificate
   // chain and signature. For http, this can be null. If a matching session
   // already exists, this method will return OK.  If no matching session exists,
   // this will return ERR_IO_PENDING and will invoke OnRequestComplete
   // asynchronously.
   int Create(const HostPortProxyPair& host_port_proxy_pair,
              bool is_https,
@@ skipping 141 matching lines @@
   uint64 port_seed_;
 
   base::WeakPtrFactory<QuicStreamFactory> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicStreamFactory);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_STREAM_FACTORY_H_