Land Recent QUIC changes.

net/quic/crypto/crypto_handshake_test.cc

 // Copyright (c) 2013 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.
 
 #include "net/quic/crypto/crypto_handshake.h"
 
 #include <stdarg.h>
 
 #include "base/stl_util.h"
 #include "net/quic/crypto/aes_128_gcm_12_encrypter.h"
@@ skipping 71 matching lines @@
       expected.push_back(make_pair(server_config_id, is_primary));
     }
 
     va_end(ap);
 
     base::AutoLock locked(server_config_->configs_lock_);
 
     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();
            j != expected.end(); ++j) {
         if (i->first == j->first && i->second->is_primary == j->second) {
           found = true;
           j->first.clear();
           break;
         }
       }
 
       ASSERT_TRUE(found) << "Failed to find match for " << i->first
                          << " in configs:\n" << ConfigsDebug();
     }
   }
 
   // ConfigsDebug returns a string that contains debugging information about
   // the set of Configs loaded in |server_config_| and their status.
   // ConfigsDebug() should be called after acquiring
   // server_config_->configs_lock_.
   string ConfigsDebug() {
     if (server_config_->configs_.empty()) {
       return "No Configs in QuicCryptoServerConfig";
     }
 
     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) {
         s += "(primary) ";
       } else {
         s += "          ";
       }
       s += config->id;
       s += "\n";
     }
@@ skipping 218 matching lines @@
              NULL);
   test_peer_.CheckConfigs(
       "a", false,
       "b", true,
       "c", false,
       NULL);
 }
 
 }  // namespace test
 }  // namespace net