Landing Recent QUIC changes until 9:58 AM, Sep 17, 2016 UTC

net/quic/core/crypto/crypto_server_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 <algorithm>
 #include <cstdint>
 #include <memory>
 #include <ostream>
 #include <vector>
 
@@ skipping 183 matching lines @@
                      bool should_succeed,
                      const char* error_substr,
                      bool* called)
         : test_(test),
           should_succeed_(should_succeed),
           error_substr_(error_substr),
           called_(called) {
       *called_ = false;
     }
 
-    void Run(std::unique_ptr<Result> result,
+    void Run(scoped_refptr<Result> result,
              std::unique_ptr<ProofSource::Details> /* details */) override {
       {
         // Ensure that the strike register client lock is not held.
         QuicCryptoServerConfigPeer peer(&test_->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);
       }
       ASSERT_FALSE(*called_);
-      test_->ProcessValidationResult(*result, should_succeed_, error_substr_);
+      test_->ProcessValidationResult(std::move(result), should_succeed_,
+                                     error_substr_);
       *called_ = true;
     }
 
    private:
     CryptoServerTest* test_;
-    bool should_succeed_;
-    const char* error_substr_;
+    const bool should_succeed_;
+    const char* const error_substr_;
     bool* called_;
   };
 
   void CheckServerHello(const CryptoHandshakeMessage& server_hello) {
     const QuicTag* versions;
     size_t num_versions;
     server_hello.GetTaglist(kVER, &versions, &num_versions);
     ASSERT_EQ(supported_versions_.size(), num_versions);
     for (size_t i = 0; i < num_versions; ++i) {
       EXPECT_EQ(QuicVersionToQuicTag(supported_versions_[i]), versions[i]);
@@ skipping 29 matching lines @@
                             const CryptoHandshakeMessage& message,
                             bool* called) {
     IPAddress server_ip;
     config_.ValidateClientHello(
         message, client_address_.address(), server_ip,
         supported_versions_.front(), &clock_, &crypto_proof_,
         std::unique_ptr<ValidateCallback>(
             new ValidateCallback(this, false, error_substr, called)));
   }
 
-  void ProcessValidationResult(const ValidateCallback::Result& result,
+  void ProcessValidationResult(scoped_refptr<ValidateCallback::Result> result,
                                bool should_succeed,
                                const char* error_substr) {
     IPAddress server_ip;
     DiversificationNonce diversification_nonce;
     string error_details;
     QuicConnectionId server_designated_connection_id =
         rand_for_id_generation_.RandUint64();
     QuicErrorCode error = config_.ProcessClientHello(
         result, /*reject_only=*/false, /*connection_id=*/1, server_ip,
         client_address_, supported_versions_.front(), supported_versions_,
         use_stateless_rejects_, server_designated_connection_id, &clock_, rand_,
         &compressed_certs_cache_, &params_, &crypto_proof_,
         /*total_framing_overhead=*/50, chlo_packet_size_, &out_,
         &diversification_nonce, &error_details);
 
     if (should_succeed) {
       ASSERT_EQ(error, QUIC_NO_ERROR) << "Message failed with error "
                                       << error_details << ": "
-                                      << result.client_hello.DebugString();
+                                      << result->client_hello.DebugString();
     } else {
       ASSERT_NE(error, QUIC_NO_ERROR) << "Message didn't fail: "
-                                      << result.client_hello.DebugString();
+                                      << result->client_hello.DebugString();
 
       EXPECT_TRUE(error_details.find(error_substr) != string::npos)
           << error_substr << " not in " << error_details;
     }
   }
 
   string GenerateNonce() {
     string nonce;
     CryptoUtils::GenerateNonce(
         clock_.WallNow(), rand_,
@@ skipping 939 matching lines @@
     EXPECT_EQ(0, strike_register_client_->PendingVerifications());
   } else {
     // version 33.
     ASSERT_EQ(kSHLO, out_.tag());
     CheckServerHello(out_);
   }
 }
 
 }  // namespace test
 }  // namespace net