Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(921)

Unified Diff: net/url_request/url_request_test_util.cc

Issue 356713005: Rename ServerBoundCert => ChannelID to reflect the current name (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/url_request/url_request_test_util.cc
diff --git a/net/url_request/url_request_test_util.cc b/net/url_request/url_request_test_util.cc
index e4a7edd1be1e7dbd3969aa7a013e1a00062b83f4..ea26d35577c57a5b75a9dfe3954a5ecd96665587 100644
--- a/net/url_request/url_request_test_util.cc
+++ b/net/url_request/url_request_test_util.cc
@@ -16,8 +16,8 @@
#include "net/http/http_response_headers.h"
#include "net/http/http_server_properties_impl.h"
#include "net/http/transport_security_state.h"
-#include "net/ssl/default_server_bound_cert_store.h"
-#include "net/ssl/server_bound_cert_service.h"
+#include "net/ssl/channel_id_service.h"
+#include "net/ssl/default_channel_id_store.h"
#include "net/url_request/static_http_user_agent_settings.h"
#include "net/url_request/url_request_job_factory_impl.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -115,10 +115,10 @@ void TestURLRequestContext::Init() {
if (!cookie_store())
context_storage_.set_cookie_store(new CookieMonster(NULL, NULL));
// In-memory origin bound cert service.
wtc 2014/07/01 19:50:57 origin bound cert => channel ID
Ryan Hamilton 2014/07/21 19:12:13 Done.
- if (!server_bound_cert_service()) {
- context_storage_.set_server_bound_cert_service(
- new ServerBoundCertService(
- new DefaultServerBoundCertStore(NULL),
+ if (!channel_id_service()) {
+ context_storage_.set_channel_id_service(
+ new ChannelIDService(
+ new DefaultChannelIDStore(NULL),
base::WorkerPool::GetTaskRunner(true)));
}
if (!http_user_agent_settings()) {

Powered by Google App Engine
This is Rietveld 408576698