Landing Recent QUIC changes until Mon Nov 14 04:43:50 2016 +0000

net/quic/test_tools/fake_proof_source.h

 // 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.
 
 #ifndef NET_QUIC_TEST_TOOLS_FAKE_PROOF_SOURCE_H_
 #define NET_QUIC_TEST_TOOLS_FAKE_PROOF_SOURCE_H_
 
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 19 matching lines @@
   void Activate();
 
   // ProofSource interface
   bool GetProof(const IPAddress& server_ip,
                 const std::string& hostname,
                 const std::string& server_config,
                 QuicVersion quic_version,
                 base::StringPiece chlo_hash,
                 const QuicTagVector& connection_options,
                 scoped_refptr<ProofSource::Chain>* out_chain,
-                std::string* out_signature,
-                std::string* out_leaf_cert_sct) override;
+                QuicCryptoProof* out_proof) override;
   void GetProof(const IPAddress& server_ip,
                 const std::string& hostname,
                 const std::string& server_config,
                 QuicVersion quic_version,
                 base::StringPiece chlo_hash,
                 const QuicTagVector& connection_options,
                 std::unique_ptr<ProofSource::Callback> callback) override;
 
   // Get the number of callbacks which are pending
   int NumPendingCallbacks() const;
@@ skipping 27 matching lines @@
     std::unique_ptr<ProofSource::Callback> callback;
   };
 
   std::vector<Params> params_;
 };
 
 }  // namespace test
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_FAKE_PROOF_SOURCE_H_