summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-06 20:28:10 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-06 20:28:10 +0000
commitacfce00415828654190b5aa39dbf60fa5fa12222 (patch)
tree4eb53bd9380a1b6041c11e263faff1631e8869f8 /net
parent1345c560d2e1857039d2cd2926b9d2201396daad (diff)
downloadchromium_src-acfce00415828654190b5aa39dbf60fa5fa12222.zip
chromium_src-acfce00415828654190b5aa39dbf60fa5fa12222.tar.gz
chromium_src-acfce00415828654190b5aa39dbf60fa5fa12222.tar.bz2
Show ServerBoundCerts in site data viewer.
BUG=107056 TEST=browse with --enable-origin-bound-certs, go to site data, look at certs, try deleting them Review URL: https://chromiumcodereview.appspot.com/9860025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131178 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/default_server_bound_cert_store.cc2
-rw-r--r--net/base/default_server_bound_cert_store.h2
-rw-r--r--net/base/default_server_bound_cert_store_unittest.cc2
-rw-r--r--net/base/server_bound_cert_store.h6
4 files changed, 7 insertions, 5 deletions
diff --git a/net/base/default_server_bound_cert_store.cc b/net/base/default_server_bound_cert_store.cc
index 180792a..3252899 100644
--- a/net/base/default_server_bound_cert_store.cc
+++ b/net/base/default_server_bound_cert_store.cc
@@ -102,7 +102,7 @@ void DefaultServerBoundCertStore::DeleteAll() {
}
void DefaultServerBoundCertStore::GetAllServerBoundCerts(
- std::vector<ServerBoundCert>* server_bound_certs) {
+ ServerBoundCertList* server_bound_certs) {
base::AutoLock autolock(lock_);
InitIfNecessary();
for (ServerBoundCertMap::iterator it = server_bound_certs_.begin();
diff --git a/net/base/default_server_bound_cert_store.h b/net/base/default_server_bound_cert_store.h
index 1ba7090d..cd664fe 100644
--- a/net/base/default_server_bound_cert_store.h
+++ b/net/base/default_server_bound_cert_store.h
@@ -74,7 +74,7 @@ class NET_EXPORT DefaultServerBoundCertStore : public ServerBoundCertStore {
base::Time delete_end) OVERRIDE;
virtual void DeleteAll() OVERRIDE;
virtual void GetAllServerBoundCerts(
- std::vector<ServerBoundCert>* server_bound_certs) OVERRIDE;
+ ServerBoundCertList* server_bound_certs) OVERRIDE;
virtual int GetCertCount() OVERRIDE;
private:
diff --git a/net/base/default_server_bound_cert_store_unittest.cc b/net/base/default_server_bound_cert_store_unittest.cc
index 5fbe4e2..fb94234a 100644
--- a/net/base/default_server_bound_cert_store_unittest.cc
+++ b/net/base/default_server_bound_cert_store_unittest.cc
@@ -286,7 +286,7 @@ TEST(DefaultServerBoundCertStoreTest, TestGetAll) {
"g", "h");
EXPECT_EQ(4, store.GetCertCount());
- std::vector<ServerBoundCertStore::ServerBoundCert> certs;
+ ServerBoundCertStore::ServerBoundCertList certs;
store.GetAllServerBoundCerts(&certs);
EXPECT_EQ(4u, certs.size());
}
diff --git a/net/base/server_bound_cert_store.h b/net/base/server_bound_cert_store.h
index 02dfe52..32b178e 100644
--- a/net/base/server_bound_cert_store.h
+++ b/net/base/server_bound_cert_store.h
@@ -6,8 +6,8 @@
#define NET_BASE_SERVER_BOUND_CERT_STORE_H_
#pragma once
+#include <list>
#include <string>
-#include <vector>
#include "base/time.h"
#include "net/base/net_export.h"
@@ -62,6 +62,8 @@ class NET_EXPORT ServerBoundCertStore {
std::string cert_;
};
+ typedef std::list<ServerBoundCert> ServerBoundCertList;
+
virtual ~ServerBoundCertStore() {}
// TODO(rkn): File I/O may be required, so this should have an asynchronous
@@ -105,7 +107,7 @@ class NET_EXPORT ServerBoundCertStore {
// Returns all server bound certs and the corresponding private keys.
virtual void GetAllServerBoundCerts(
- std::vector<ServerBoundCert>* server_bound_certs) = 0;
+ ServerBoundCertList* server_bound_certs) = 0;
// Returns the number of certs in the store.
// Public only for unit testing.