Landing Recent QUIC changes until 5:30 PM, Feb 3, 2017 UTC-5

net/quic/quartc/quartc_session_test.cc

 // Copyright (c) 2016 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/quartc/quartc_session.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 35 matching lines @@
   run_loop.Run();
 }
 
 // Used by QuicCryptoServerConfig to provide server credentials, returning a
 // canned response equal to |success|.
 class FakeProofSource : public net::ProofSource {
  public:
   explicit FakeProofSource(bool success) : success_(success) {}
 
   // ProofSource override.
-  bool GetProof(const QuicSocketAddress& server_ip,
-                const std::string& hostname,
-                const std::string& server_config,
-                net::QuicVersion quic_version,
-                base::StringPiece chlo_hash,
-                const net::QuicTagVector& connection_options,
-                QuicReferenceCountedPointer<net::ProofSource::Chain>* out_certs,
-                net::QuicCryptoProof* proof) override {
-    if (success_) {
-      std::vector<std::string> certs;
-      certs.push_back("Required to establish handshake");
-      *out_certs = new ProofSource::Chain(certs);
-      proof->signature = "Signature";
-      proof->leaf_cert_scts = "Time";
-    }
-    return success_;
-  }
-
   void GetProof(const QuicSocketAddress& server_ip,
                 const std::string& hostname,
                 const std::string& server_config,
                 net::QuicVersion quic_version,
                 base::StringPiece chlo_hash,
                 const net::QuicTagVector& connection_options,
                 std::unique_ptr<Callback> callback) override {
-    LOG(INFO) << "GetProof() providing dummy credentials for insecure QUIC";
+    QuicReferenceCountedPointer<net::ProofSource::Chain> chain;
+    net::QuicCryptoProof proof;
+    if (success_) {
+      std::vector<std::string> certs;
+      certs.push_back("Required to establish handshake");
+      chain = new ProofSource::Chain(certs);
+      proof.signature = "Signature";
+      proof.leaf_cert_scts = "Time";
+    }
+    callback->Run(success_, chain, proof, nullptr /* details */);
   }
 
  private:
   // Whether or not obtaining proof source succeeds.
   bool success_;
 };
 
 // Used by QuicCryptoClientConfig to verify server credentials, returning a
 // canned response of QUIC_SUCCESS if |success| is true.
 class FakeProofVerifier : public net::ProofVerifier {
@@ skipping 411 matching lines @@
   EXPECT_FALSE(client_peer_->IsClosedStream(id));
   stream->SetDelegate(client_peer_->stream_delegate());
   stream->Close();
   RunLoopWithTimeout();
   EXPECT_TRUE(client_peer_->IsClosedStream(id));
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net