Land Recent QUIC Changes.

net/quic/crypto/quic_crypto_server_config_test.cc

 // Copyright 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/quic_crypto_server_config.h"
 
 #include <stdarg.h>
 
 #include "base/stl_util.h"
 #include "net/quic/crypto/aes_128_gcm_12_encrypter.h"
@@ skipping 134 matching lines @@
         QuicWallTime::FromUNIXSeconds(seconds));
   }
 
  private:
   const QuicCryptoServerConfig* server_config_;
 };
 
 class TestStrikeRegisterClient : public StrikeRegisterClient {
  public:
   explicit TestStrikeRegisterClient(QuicCryptoServerConfig* config)
-      : config_(config), is_known_orbit_called_(false) {}
+      : config_(config),
+        is_known_orbit_called_(false) {
+  }
 
   virtual bool IsKnownOrbit(StringPiece orbit) const OVERRIDE {
     // Ensure that the strike register client lock is not held.
     QuicCryptoServerConfigPeer peer(config_);
     base::Lock* m = peer.GetStrikeRegisterClientLock();
     // In Chromium, we will dead lock if the lock is held by the current thread.
     // Chromium doesn't have AssertNotHeld API call.
     // m->AssertNotHeld();
     base::AutoLock lock(*m);
 
@@ skipping 369 matching lines @@
              NULL);
   test_peer_.CheckConfigs(
       "a", false,
       "b", true,
       "c", false,
       NULL);
 }
 
 }  // namespace test
 }  // namespace net