Remove certificates from Channel ID

net/ssl/channel_id_store.cc

Index: net/ssl/channel_id_store.cc
diff --git a/net/ssl/channel_id_store.cc b/net/ssl/channel_id_store.cc
index 930ef8f4ed993d038bb390524704d2c3533e10b1..9012ab9d9d8d244f4a9614671e628b686b8507e5 100644
--- a/net/ssl/channel_id_store.cc
+++ b/net/ssl/channel_id_store.cc
@@ -9,25 +9,23 @@ namespace net {
 ChannelIDStore::ChannelID::ChannelID() {
 }
 
-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)
+ChannelIDStore::ChannelID::ChannelID(const std::string& server_identifier,
+                                     base::Time creation_time,
+                                     const std::string& private_key,
+                                     const std::string& public_key)
     : server_identifier_(server_identifier),
       creation_time_(creation_time),
-      expiration_time_(expiration_time),
       private_key_(private_key),
-      cert_(cert) {}
+      public_key_(public_key) {
+}
 
 ChannelIDStore::ChannelID::~ChannelID() {}
 
 void ChannelIDStore::InitializeFrom(const ChannelIDList& list) {
   for (ChannelIDList::const_iterator i = list.begin(); i != list.end();
       ++i) {
-    SetChannelID(i->server_identifier(), i->creation_time(),
-                 i->expiration_time(), i->private_key(), i->cert());
+    SetChannelID(i->server_identifier(), i->creation_time(), i->private_key(),
+                 i->public_key());
   }
 }