Land Recent QUIC changes.

net/quic/crypto/common_cert_set.h

 // 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.
 
 #ifndef NET_QUIC_CRYPTO_COMMON_CERT_SET_H_
 #define NET_QUIC_CRYPTO_COMMON_CERT_SET_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/strings/string_piece.h"
 #include "net/base/net_export.h"
 #include "net/quic/crypto/crypto_protocol.h"
 
 namespace net {
 
 // CommonCertSets is an interface to an object that contains a number of common
 // certificate sets and can match against them.
 class NET_EXPORT_PRIVATE CommonCertSets {
  public:
   virtual ~CommonCertSets();
 
+  // GetInstanceQUIC returns the standard QUIC common certificate sets.
+  static const CommonCertSets* GetInstanceQUIC();
+
   // GetCommonHashes returns a StringPiece containing the hashes of common sets
   // supported by this object. The 64-bit hashes are concatenated in the
   // StringPiece.
   virtual base::StringPiece GetCommonHashes() const = 0;
 
   // GetCert returns a specific certificate (at index |index|) in the common
   // set identified by |hash|. If no such certificate is known, an empty
   // StringPiece is returned.
   virtual base::StringPiece GetCert(uint64 hash, uint32 index) const = 0;
 
   // MatchCert tries to find |cert| in one of the common certificate sets
   // identified by |common_set_hashes|. On success it puts the hash of the
   // set in |out_hash|, the index of |cert| in the set in |out_index| and
   // returns true. Otherwise it returns false.
   virtual bool MatchCert(base::StringPiece cert,
                          base::StringPiece common_set_hashes,
                          uint64* out_hash,
                          uint32* out_index) const = 0;
 };
 
-// CommonCertSetsQUIC implements the CommonCertSets interface using the default
-// certificate sets.
-class NET_EXPORT_PRIVATE CommonCertSetsQUIC : public CommonCertSets {
- public:
-  CommonCertSetsQUIC();
-
-  // CommonCertSets interface.
-  virtual base::StringPiece GetCommonHashes() const OVERRIDE;
-
-  virtual base::StringPiece GetCert(uint64 hash, uint32 index) const OVERRIDE;
-
-  virtual bool MatchCert(base::StringPiece cert,
-                         base::StringPiece common_set_hashes,
-                         uint64* out_hash,
-                         uint32* out_index) const OVERRIDE;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(CommonCertSetsQUIC);
-};
-
 }  // namespace net
 
 #endif  // NET_QUIC_CRYPTO_COMMON_CERT_SET_H_