Land Recent QUIC Changes.

net/quic/test_tools/delayed_verify_strike_register_client.h

Index: net/quic/test_tools/delayed_verify_strike_register_client.h
diff --git a/net/quic/test_tools/delayed_verify_strike_register_client.h b/net/quic/test_tools/delayed_verify_strike_register_client.h
index 69de1d077d301de6377393f10eb2240932527278..100df36451469bccc4ab57352663cef90f64809e 100644
--- a/net/quic/test_tools/delayed_verify_strike_register_client.h
+++ b/net/quic/test_tools/delayed_verify_strike_register_client.h
@@ -23,7 +23,7 @@ class DelayedVerifyStrikeRegisterClient : public LocalStrikeRegisterClient {
                                     uint32 window_secs,
                                     const uint8 orbit[8],
                                     StrikeRegister::StartupType startup);
-  virtual ~DelayedVerifyStrikeRegisterClient();
+  virtual ~DelayedVerifyStrikeRegisterClient() OVERRIDE;
 
   virtual void VerifyNonceIsValidAndUnique(base::StringPiece nonce,
                                            QuicWallTime now,
@@ -43,7 +43,9 @@ class DelayedVerifyStrikeRegisterClient : public LocalStrikeRegisterClient {
     VerifyArgs(base::StringPiece in_nonce,
                QuicWallTime in_now,
                ResultCallback* in_cb)
-        : nonce(in_nonce.as_string()), now(in_now), cb(in_cb) {
+        : nonce(in_nonce.as_string()),
+          now(in_now),
+          cb(in_cb) {
     }
 
     std::string nonce;