Land Recent QUIC changes.

net/quic/crypto/crypto_handshake_test.cc

Index: net/quic/crypto/crypto_handshake_test.cc
diff --git a/net/quic/crypto/crypto_handshake_test.cc b/net/quic/crypto/crypto_handshake_test.cc
index 67d2caba4eb87b5a2e5f2208432e91ccb1b4ce0f..3ad50bb7f5aca1b22c6166997ead9ddb8c84cd1f 100644
--- a/net/quic/crypto/crypto_handshake_test.cc
+++ b/net/quic/crypto/crypto_handshake_test.cc
@@ -89,8 +89,8 @@ class QuicCryptoServerConfigPeer {
     ASSERT_EQ(expected.size(), server_config_->configs_.size())
         << ConfigsDebug();
 
-    for (QuicCryptoServerConfig::ConfigMap::const_iterator i =
-             server_config_->configs_.begin();
+    for (QuicCryptoServerConfig::ConfigMap::const_iterator
+             i = server_config_->configs_.begin();
          i != server_config_->configs_.end(); ++i) {
       bool found = false;
       for (vector<pair<ServerConfigID, bool> >::iterator j = expected.begin();
@@ -118,8 +118,8 @@ class QuicCryptoServerConfigPeer {
 
     string s;
 
-    for (QuicCryptoServerConfig::ConfigMap::const_iterator i =
-             server_config_->configs_.begin();
+    for (QuicCryptoServerConfig::ConfigMap::const_iterator
+             i = server_config_->configs_.begin();
          i != server_config_->configs_.end(); ++i) {
       const scoped_refptr<QuicCryptoServerConfig::Config> config = i->second;
       if (config->is_primary) {