Remove certificates from Channel ID

net/ssl/default_channel_id_store.h

 // Copyright 2014 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_SSL_DEFAULT_CHANNEL_ID_STORE_H_
 #define NET_SSL_DEFAULT_CHANNEL_ID_STORE_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 27 matching lines @@
   // class will take care of initializing it. The backing store is NOT owned by
   // this class, but it must remain valid for the duration of the
   // DefaultChannelIDStore's existence. If |store| is NULL, then no
   // backing store will be updated.
   explicit DefaultChannelIDStore(PersistentStore* store);
 
   ~DefaultChannelIDStore() override;
 
   // ChannelIDStore implementation.
   int GetChannelID(const std::string& server_identifier,
-                   base::Time* expiration_time,
                    std::string* private_key_result,
-                   std::string* cert_result,
+                   std::string* public_key_result,
                    const GetChannelIDCallback& callback) override;
   void SetChannelID(const std::string& server_identifier,
                     base::Time creation_time,
-                    base::Time expiration_time,
                     const std::string& private_key,
-                    const std::string& cert) override;
+                    const std::string& public_key) override;
   void DeleteChannelID(const std::string& server_identifier,
                        const base::Closure& callback) override;
   void DeleteAllCreatedBetween(base::Time delete_begin,
                                base::Time delete_end,
                                const base::Closure& callback) override;
   void DeleteAll(const base::Closure& callback) override;
   void GetAllChannelIDs(const GetChannelIDListCallback& callback) override;
   int GetChannelIDCount() override;
   void SetForceKeepSessionState() override;
 
@@ skipping 26 matching lines @@
 
   // Initializes the backing store and reads existing certs from it.
   // Should only be called by InitIfNecessary().
   void InitStore();
 
   // Callback for backing store loading completion.
   void OnLoaded(scoped_ptr<ScopedVector<ChannelID> > certs);
 
   // Syncronous methods which do the actual work. Can only be called after
   // initialization is complete.
-  void SyncSetChannelID(
-      const std::string& server_identifier,
-      base::Time creation_time,
-      base::Time expiration_time,
-      const std::string& private_key,
-      const std::string& cert);
+  void SyncSetChannelID(const std::string& server_identifier,
+                        base::Time creation_time,
+                        const std::string& private_key,
+                        const std::string& public_key);
   void SyncDeleteChannelID(const std::string& server_identifier);
   void SyncDeleteAllCreatedBetween(base::Time delete_begin,
                                    base::Time delete_end);
   void SyncGetAllChannelIDs(ChannelIDList* channel_id_list);
 
   // Add |task| to |waiting_tasks_|.
   void EnqueueTask(scoped_ptr<Task> task);
   // If already initialized, run |task| immediately. Otherwise add it to
   // |waiting_tasks_|.
   void RunOrEnqueueTask(scoped_ptr<Task> task);
@@ skipping 59 matching lines @@
   PersistentStore();
   virtual ~PersistentStore();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PersistentStore);
 };
 
 }  // namespace net
 
 #endif  // NET_SSL_DEFAULT_CHANNEL_ID_STORE_H_