Implements migration of a QUIC connection to a different destination address if specified by the se…

net/quic/quic_stream_factory.h

Index: net/quic/quic_stream_factory.h
diff --git a/net/quic/quic_stream_factory.h b/net/quic/quic_stream_factory.h
index 2f014d1242105c7ca6459381dd2b78bda8c7f588..6f7a1f7ec2c1dbbf6375a40d37635f475037a472 100644
--- a/net/quic/quic_stream_factory.h
+++ b/net/quic/quic_stream_factory.h
@@ -296,13 +296,22 @@ class NET_EXPORT_PRIVATE QuicStreamFactory
                                  MigrationCause migration_cause,
                                  scoped_refptr<StringIOBuffer> packet);
 
-  // Method that migrates |session| over to using |new_network|. If
-  // not null, |packet| is sent on the new network, else a PING frame
-  // is sent. Returns ERR_QUIC_PROTOCOL_ERROR if migration fails.
-  void MigrateSessionToNetwork(QuicChromiumClientSession* session,
-                               NetworkChangeNotifier::NetworkHandle new_network,
-                               const BoundNetLog& bound_net_log,
-                               scoped_refptr<StringIOBuffer> packet);
+  // Migrates |session| over to using |network|. If |network| is
+  // kInvalidNetworkHandle, default network is used. If |packet| is
+  // not null, it is sent on the new network, else a PING frame is
+  // sent.
+  void MigrateSessionToNewNetwork(QuicChromiumClientSession* session,
+                                  NetworkChangeNotifier::NetworkHandle network,
+                                  const BoundNetLog& bound_net_log,
+                                  scoped_refptr<StringIOBuffer> packet);

[Ryan Hamilton, 2016/07/12 22:39:26]

Looks like the only caller of this method passes in nullptr here, so let's drop
this argument (and the impl of this method will pass nullptr to
MigrateSession()).

[Jana, 2016/07/12 23:21:53]

Done.

+
+  // Migrates |session| over to using |peer_address|. If |packet| is not null,
+  // it is sent
+  // on the new network, else a PING frame is sent.
+  void MigrateSessionToNewPeerAddress(QuicChromiumClientSession* session,
+                                      IPEndPoint peer_address,
+                                      const BoundNetLog& bound_net_log,
+                                      scoped_refptr<StringIOBuffer> packet);
 
   // NetworkChangeNotifier::IPAddressObserver methods:
 
@@ -446,6 +455,16 @@ class NET_EXPORT_PRIVATE QuicStreamFactory
 
   void MaybeDisableQuic(uint16_t port);
 
+  // Internal method that migrates |session| over to using
+  // |peer_address| and |network|. If |network| is kInvalidNetworkHandle,
+  // default network is used. If |packet| is not null, it is sent
+  // on the new network, else a PING frame is sent.
+  void MigrateSession(QuicChromiumClientSession* session,
+                      IPEndPoint peer_address,
+                      NetworkChangeNotifier::NetworkHandle network,
+                      const BoundNetLog& bound_net_log,
+                      scoped_refptr<StringIOBuffer> packet);
+
   bool require_confirmation_;
   NetLog* net_log_;
   HostResolver* host_resolver_;