summaryrefslogtreecommitdiffstats
path: root/net/socket/client_socket_pool_manager.cc
diff options
context:
space:
mode:
authorszager@chromium.org <szager@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-07 21:27:35 +0000
committerszager@chromium.org <szager@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-07 21:27:35 +0000
commitc2dad2976730464242e1b89edd6db17163a5fa02 (patch)
tree277f0e83c1c28ab371bf696a9d6d46eb5520bfb0 /net/socket/client_socket_pool_manager.cc
parent28196f11973c0615b3e871a48bb8f8babccd4082 (diff)
downloadchromium_src-c2dad2976730464242e1b89edd6db17163a5fa02.zip
chromium_src-c2dad2976730464242e1b89edd6db17163a5fa02.tar.gz
chromium_src-c2dad2976730464242e1b89edd6db17163a5fa02.tar.bz2
Remove static variables from HttpStreamFactory.
Refresh of issue 10389162. BUG=124900 Review URL: https://chromiumcodereview.appspot.com/10834215 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155485 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/client_socket_pool_manager.cc')
-rw-r--r--net/socket/client_socket_pool_manager.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc
index d5591b7..5884e08 100644
--- a/net/socket/client_socket_pool_manager.cc
+++ b/net/socket/client_socket_pool_manager.cc
@@ -93,10 +93,10 @@ int InitSocketPoolHelper(const GURL& request_url,
HostPortPair(request_url.HostNoBrackets(),
request_url.EffectiveIntPort());
- if (!using_ssl && HttpStreamFactory::testing_fixed_http_port() != 0) {
- origin_host_port.set_port(HttpStreamFactory::testing_fixed_http_port());
- } else if (using_ssl && HttpStreamFactory::testing_fixed_https_port() != 0) {
- origin_host_port.set_port(HttpStreamFactory::testing_fixed_https_port());
+ if (!using_ssl && session->params().testing_fixed_http_port != 0) {
+ origin_host_port.set_port(session->params().testing_fixed_http_port);
+ } else if (using_ssl && session->params().testing_fixed_https_port != 0) {
+ origin_host_port.set_port(session->params().testing_fixed_https_port);
}
bool disable_resolver_cache =
@@ -105,7 +105,7 @@ int InitSocketPoolHelper(const GURL& request_url,
request_load_flags & LOAD_DISABLE_CACHE;
int load_flags = request_load_flags;
- if (HttpStreamFactory::ignore_certificate_errors())
+ if (session->params().ignore_certificate_errors)
load_flags |= LOAD_IGNORE_ALL_CERT_ERRORS;
// Build the string used to uniquely identify connections of this type.