Deprecate FLAG_require_strike_register_or_server_nonce

net/quic/quic_crypto_server_stream_test.cc

 // Copyright (c) 2012 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/quic_crypto_server_stream.h"
 
 #include <map>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 357 matching lines @@
     EXPECT_EQ(1u, messages_moved.first);
     EXPECT_EQ(1u, messages_moved.second);
     EXPECT_TRUE(client_stream()->handshake_confirmed());
     EXPECT_TRUE(server_stream()->handshake_confirmed());
   } else {
     CryptoTestUtils::CommunicateHandshakeMessages(
         client_connection_, client_stream(), server_connection_,
         server_stream());
   }
 
-  if (FLAGS_require_strike_register_or_server_nonce &&
-      !AsyncStrikeRegisterVerification()) {
+  if (AsyncStrikeRegisterVerification()) {
+    EXPECT_EQ(1, client_stream()->num_sent_client_hellos());
+  } else {
     EXPECT_EQ(2, client_stream()->num_sent_client_hellos());
-  } else {
-    EXPECT_EQ(1, client_stream()->num_sent_client_hellos());
   }
 }
 
 TEST_P(QuicCryptoServerStreamTest, MessageAfterHandshake) {
   FLAGS_quic_require_fix = false;
   Initialize();
   CompleteCryptoHandshake();
   EXPECT_CALL(*server_connection_,
               SendConnectionCloseWithDetails(
                   QUIC_CRYPTO_MESSAGE_AFTER_HANDSHAKE_COMPLETE, _));
@@ skipping 126 matching lines @@
       QUIC_NO_ERROR, ConnectionCloseSource::FROM_PEER);
 
   // The outstanding nonce verification RPC now completes.
   strike_register_client_->RunPendingVerifications();
 }
 
 }  // namespace
 
 }  // namespace test
 }  // namespace net