net/url_request/url_request_context_builder.cc - Issue 12680003: net: split net/ssl out of net/base

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: net/url_request/url_request_context_builder.cc

Issue 12680003: net: split net/ssl out of net/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 9 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:

Index: net/url_request/url_request_context_builder.cc

diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc

index 97c3cf2884dc561402717796b26f6dbfe6edbe5c..c82729ff1c2c521bb82ea3771b1ecb6bd4be6400 100644

--- a/net/url_request/url_request_context_builder.cc

+++ b/net/url_request/url_request_context_builder.cc

@@ -10,14 +10,12 @@

#include "base/compiler_specific.h"

#include "base/logging.h"

#include "base/string_util.h"

-#include "base/threading/thread.h"

#include "base/thread_task_runner_handle.h"

+#include "base/threading/thread.h"

#include "net/base/cert_verifier.h"

#include "net/base/host_resolver.h"

#include "net/base/net_errors.h"

#include "net/base/network_delegate.h"

-#include "net/base/ssl_config_service_defaults.h"

-#include "net/base/transport_security_state.h"

#include "net/cookies/cookie_monster.h"

#include "net/ftp/ftp_network_layer.h"

#include "net/http/http_auth_handler_factory.h"

@@ -25,7 +23,9 @@

#include "net/http/http_network_layer.h"

#include "net/http/http_network_session.h"

#include "net/http/http_server_properties_impl.h"

+#include "net/http/transport_security_state.h"

#include "net/proxy/proxy_service.h"

+#include "net/ssl/ssl_config_service_defaults.h"

#include "net/url_request/static_http_user_agent_settings.h"

#include "net/url_request/url_request_context.h"

#include "net/url_request/url_request_context_storage.h"