Update from chromium https://crrev.com/301725/

net/quic/crypto/quic_server_info.h

Index: net/quic/crypto/quic_server_info.h
diff --git a/net/quic/crypto/quic_server_info.h b/net/quic/crypto/quic_server_info.h
index fd54b94ad92e9150bb5c23a0a0717cdfc2ae0368..2a5c6fca41666adb77a362c49547cf48bd644424 100644
--- a/net/quic/crypto/quic_server_info.h
+++ b/net/quic/crypto/quic_server_info.h
@@ -45,6 +45,10 @@ class NET_EXPORT_PRIVATE QuicServerInfo {
   // but, obviously, a callback will never be made.
   virtual int WaitForDataReady(const CompletionCallback& callback) = 0;
 
+  // Cancel's WaitForDataReady callback. |callback| passed in WaitForDataReady
+  // will not be called.
+  virtual void CancelWaitForDataReadyCallback() = 0;
+
   // Returns true if data is loaded from disk cache and ready (WaitForDataReady
   // doesn't have a pending callback).
   virtual bool IsDataReady() = 0;
@@ -104,13 +108,16 @@ class NET_EXPORT_PRIVATE QuicServerInfo {
   DISALLOW_COPY_AND_ASSIGN(QuicServerInfo);
 };
 
-class QuicServerInfoFactory {
+class NET_EXPORT_PRIVATE QuicServerInfoFactory {
  public:
+  QuicServerInfoFactory() {}
   virtual ~QuicServerInfoFactory();
 
   // GetForServer returns a fresh, allocated QuicServerInfo for the given
   // |server_id| or NULL on failure.
   virtual QuicServerInfo* GetForServer(const QuicServerId& server_id) = 0;
+
+  DISALLOW_COPY_AND_ASSIGN(QuicServerInfoFactory);
 };
 
 }  // namespace net