content/shell/browser/shell_url_request_context_getter.cc - Issue 356713005: Rename ServerBoundCert => ChannelID to reflect the current name

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/shell/browser/shell_url_request_context_getter.cc

Issue 356713005: Rename ServerBoundCert => ChannelID to reflect the current name (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix cookies_list.js Created 6 years, 5 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

« chrome/browser/resources/options/cookies_list.js ('K') | « content/browser/browser_context.cc ('k') | google_apis/gcm/tools/mcs_probe.cc » ('j') | net/socket_stream/socket_stream.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/browser/shell_url_request_context_getter.cc

diff --git a/content/shell/browser/shell_url_request_context_getter.cc b/content/shell/browser/shell_url_request_context_getter.cc

index 9d01a4340ff1cee8578b8d321a9e293996b1c6d6..7b34e124a6260b15dfc53b9cff7a49e8b0decbeb 100644

--- a/content/shell/browser/shell_url_request_context_getter.cc

+++ b/content/shell/browser/shell_url_request_context_getter.cc

@@ -28,8 +28,8 @@

#include "net/http/http_server_properties_impl.h"

#include "net/http/transport_security_state.h"

#include "net/proxy/proxy_service.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/ssl/ssl_config_service_defaults.h"

#include "net/url_request/data_protocol_handler.h"

#include "net/url_request/file_protocol_handler.h"

@@ -106,8 +106,8 @@ net::URLRequestContext* ShellURLRequestContextGetter::GetURLRequestContext() {

storage_.reset(

new net::URLRequestContextStorage(url_request_context_.get()));

storage_->set_cookie_store(CreateCookieStore(CookieStoreConfig()));

- storage_->set_server_bound_cert_service(new net::ServerBoundCertService(

- new net::DefaultServerBoundCertStore(NULL),

+ storage_->set_channel_id_service(new net::ChannelIDService(

+ new net::DefaultChannelIDStore(NULL),

base::WorkerPool::GetTaskRunner(true)));

storage_->set_http_user_agent_settings(

new net::StaticHttpUserAgentSettings(

@@ -157,8 +157,8 @@ net::URLRequestContext* ShellURLRequestContextGetter::GetURLRequestContext() {

url_request_context_->cert_verifier();

network_session_params.transport_security_state =

url_request_context_->transport_security_state();

- network_session_params.server_bound_cert_service =

- url_request_context_->server_bound_cert_service();

+ network_session_params.channel_id_service =

+ url_request_context_->channel_id_service();

network_session_params.proxy_service =

url_request_context_->proxy_service();

network_session_params.ssl_config_service =

« chrome/browser/resources/options/cookies_list.js ('K') | « content/browser/browser_context.cc ('k') | google_apis/gcm/tools/mcs_probe.cc » ('j') | net/socket_stream/socket_stream.cc » ('J')