Remove certificates from Channel ID

net/ssl/channel_id_store.h

Index: net/ssl/channel_id_store.h
diff --git a/net/ssl/channel_id_store.h b/net/ssl/channel_id_store.h
index 1e971a5e82f8f9338e43f907b9e75a3022b84e25..71c7dae6ac56d47eea85dba232d0103eb8e7c0f1 100644
--- a/net/ssl/channel_id_store.h
+++ b/net/ssl/channel_id_store.h
@@ -32,31 +32,26 @@ class NET_EXPORT ChannelIDStore
     ChannelID();
     ChannelID(const std::string& server_identifier,
               base::Time creation_time,
-              base::Time expiration_time,
               const std::string& private_key,
-              const std::string& cert);
+              const std::string& public_key);
     ~ChannelID();
 
     // Server identifier.  For domain bound certs, for instance "verisign.com".
     const std::string& server_identifier() const { return server_identifier_; }
-    // The time the certificate was created, also the start of the certificate
-    // validity period.
+    // The time the certificate was created.

[mattm, 2015/04/10 01:00:28]

key

[nharper, 2015/04/25 02:59:19]

Done.

     base::Time creation_time() const { return creation_time_; }
-    // The time after which this certificate is no longer valid.
-    base::Time expiration_time() const { return expiration_time_; }
     // The encoding of the private key depends on the type.
     // rsa_sign: DER-encoded PrivateKeyInfo struct.
     // ecdsa_sign: DER-encoded EncryptedPrivateKeyInfo struct.
     const std::string& private_key() const { return private_key_; }
-    // DER-encoded certificate.
-    const std::string& cert() const { return cert_; }
+    // DER-encoded public key.
+    const std::string& public_key() const { return public_key_; }
 
    private:
     std::string server_identifier_;
     base::Time creation_time_;
-    base::Time expiration_time_;
     std::string private_key_;
-    std::string cert_;
+    std::string public_key_;
   };
 
   typedef std::list<ChannelID> ChannelIDList;
@@ -64,7 +59,6 @@ class NET_EXPORT ChannelIDStore
   typedef base::Callback<void(
       int,
       const std::string&,
-      base::Time,
       const std::string&,
       const std::string&)> GetChannelIDCallback;
   typedef base::Callback<void(const ChannelIDList&)> GetChannelIDListCallback;
@@ -79,7 +73,6 @@ class NET_EXPORT ChannelIDStore
   // asynchronously.
   virtual int GetChannelID(
       const std::string& server_identifier,
-      base::Time* expiration_time,
       std::string* private_key_result,
       std::string* cert_result,
       const GetChannelIDCallback& callback) = 0;
@@ -88,7 +81,6 @@ class NET_EXPORT ChannelIDStore
   virtual void SetChannelID(
       const std::string& server_identifier,
       base::Time creation_time,
-      base::Time expiration_time,
       const std::string& private_key,
       const std::string& cert) = 0;