Land Recent QUIC changes.

net/quic/crypto/common_cert_set.h

Index: net/quic/crypto/common_cert_set.h
diff --git a/net/quic/crypto/common_cert_set.h b/net/quic/crypto/common_cert_set.h
index 4f5d33038e62b4796f1117b0fa81f752210be389..a9e93045f57c6b9d688bff35957030f81db695c0 100644
--- a/net/quic/crypto/common_cert_set.h
+++ b/net/quic/crypto/common_cert_set.h
@@ -19,6 +19,9 @@ 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.
@@ -39,26 +42,6 @@ class NET_EXPORT_PRIVATE CommonCertSets {
                          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_