Revert 198736 "Land Recent QUIC changes"

trunk/src/net/quic/test_tools/crypto_test_utils.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/test_tools/crypto_test_utils.h"
 
-#include "net/quic/crypto/common_cert_set.h"
+#include "base/strings/string_piece.h"
 #include "net/quic/crypto/crypto_handshake.h"
 #include "net/quic/crypto/crypto_server_config.h"
 #include "net/quic/crypto/quic_decrypter.h"
 #include "net/quic/crypto/quic_encrypter.h"
 #include "net/quic/crypto/quic_random.h"
 #include "net/quic/quic_clock.h"
 #include "net/quic/quic_crypto_client_stream.h"
 #include "net/quic/quic_crypto_server_stream.h"
 #include "net/quic/quic_crypto_stream.h"
 #include "net/quic/test_tools/quic_test_utils.h"
@@ skipping 190 matching lines @@
 // static
 string CryptoTestUtils::GetValueForTag(const CryptoHandshakeMessage& message,
                                        CryptoTag tag) {
   CryptoTagValueMap::const_iterator it = message.tag_value_map().find(tag);
   if (it == message.tag_value_map().end()) {
     return string();
   }
   return it->second;
 }
 
-class MockCommonCertSet : public CommonCertSet {
- public:
-  MockCommonCertSet(StringPiece cert, uint64 hash, uint32 index)
-      : cert_(cert.as_string()),
-        hash_(hash),
-        index_(index) {
-  }
-
-  virtual StringPiece GetCommonHashes() OVERRIDE {
-    CHECK(false) << "not implemented";
-    return StringPiece();
-  }
-
-  virtual StringPiece GetCert(uint64 hash, uint32 index) OVERRIDE {
-    if (hash == hash_ && index == index_) {
-      return cert_;
-    }
-    return StringPiece();
-  }
-
-  virtual bool MatchCert(StringPiece cert,
-                         StringPiece common_set_hashes,
-                         uint64* out_hash,
-                         uint32* out_index) OVERRIDE {
-    if (cert != cert_) {
-      return false;
-    }
-
-    if (common_set_hashes.size() % sizeof(uint64) != 0) {
-      return false;
-    }
-    bool client_has_set = false;
-    for (size_t i = 0; i < common_set_hashes.size(); i += sizeof(uint64)) {
-      uint64 hash;
-      memcpy(&hash, common_set_hashes.data() + i, sizeof(hash));
-      if (hash == hash_) {
-        client_has_set = true;
-        break;
-      }
-    }
-
-    if (!client_has_set) {
-      return false;
-    }
-
-    *out_hash = hash_;
-    *out_index = index_;
-    return true;
-  }
-
- private:
-  const string cert_;
-  const uint64 hash_;
-  const uint32 index_;
-};
-
-CommonCertSet* CryptoTestUtils::MockCommonCertSet(StringPiece cert,
-                                                  uint64 hash,
-                                                  uint32 index) {
-  return new class MockCommonCertSet(cert, hash, index);
-}
-
 void CryptoTestUtils::CompareClientAndServerKeys(
     QuicCryptoClientStream* client,
     QuicCryptoServerStream* server) {
   const QuicEncrypter* client_encrypter(
       client->session()->connection()->encrypter(ENCRYPTION_INITIAL));
   // Normally we would expect the client's INITIAL decrypter to have latched
   // from the receipt of the server hello. However, when using a
   // PacketSavingConnection (at the tests do) we don't actually encrypt with
   // the correct encrypter.
   // TODO(agl): make the tests more realistic.
@@ skipping 29 matching lines @@
                                 client_decrypter_key.data(),
                                 client_decrypter_key.length());
   CompareCharArraysWithHexError("server write IV",
                                 server_encrypter_iv.data(),
                                 server_encrypter_iv.length(),
                                 client_decrypter_iv.data(),
                                 client_decrypter_iv.length());
 }
 }  // namespace test
 }  // namespace net