summaryrefslogtreecommitdiffstats
path: root/net/url_request
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-25 17:38:48 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-25 17:38:48 +0000
commiteb7974c101cec9ae3770e10e0fb8dcec706e0d83 (patch)
tree52486e785fe8638d30da032ea66ee47b7f701561 /net/url_request
parent15130b9ce78abbc354b5b3cabc3c878d3193d424 (diff)
downloadchromium_src-eb7974c101cec9ae3770e10e0fb8dcec706e0d83.zip
chromium_src-eb7974c101cec9ae3770e10e0fb8dcec706e0d83.tar.gz
chromium_src-eb7974c101cec9ae3770e10e0fb8dcec706e0d83.tar.bz2
Add origin bound certs to BrowsingDataRemover and extensions clear API.
BUG=107056 TEST="Delete cookies and other site and plug-in data" option in Clear Browsing Data dialog should clear origin bound certs. Review URL: https://chromiumcodereview.appspot.com/9120001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119084 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request')
-rw-r--r--net/url_request/url_request_test_util.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/net/url_request/url_request_test_util.cc b/net/url_request/url_request_test_util.cc
index d9544ab..c296745 100644
--- a/net/url_request/url_request_test_util.cc
+++ b/net/url_request/url_request_test_util.cc
@@ -8,7 +8,9 @@
#include "base/logging.h"
#include "base/message_loop.h"
#include "base/threading/thread.h"
+#include "net/base/default_origin_bound_cert_store.h"
#include "net/base/host_port_pair.h"
+#include "net/base/origin_bound_cert_service.h"
#include "net/http/http_network_session.h"
#include "net/http/http_server_properties_impl.h"
#include "net/url_request/url_request_job_factory.h"
@@ -140,6 +142,12 @@ void TestURLRequestContext::Init() {
// In-memory cookie store.
if (!cookie_store())
context_storage_.set_cookie_store(new net::CookieMonster(NULL, NULL));
+ // In-memory origin bound cert service.
+ if (!origin_bound_cert_service()) {
+ context_storage_.set_origin_bound_cert_service(
+ new net::OriginBoundCertService(
+ new net::DefaultOriginBoundCertStore(NULL)));
+ }
if (accept_language().empty())
set_accept_language("en-us,fr");
if (accept_charset().empty())