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

Side by Side Diff: net/url_request/url_request_test_util.cc

Issue 1298253002: Remove reference counting from HttpNetworkSession. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Missed two comments, fix some tests Created 5 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/url_request/url_request_test_util.h" 5 #include "net/url_request/url_request_test_util.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 params.client_socket_factory = client_socket_factory(); 104 params.client_socket_factory = client_socket_factory();
105 params.host_resolver = host_resolver(); 105 params.host_resolver = host_resolver();
106 params.cert_verifier = cert_verifier(); 106 params.cert_verifier = cert_verifier();
107 params.transport_security_state = transport_security_state(); 107 params.transport_security_state = transport_security_state();
108 params.proxy_service = proxy_service(); 108 params.proxy_service = proxy_service();
109 params.ssl_config_service = ssl_config_service(); 109 params.ssl_config_service = ssl_config_service();
110 params.http_auth_handler_factory = http_auth_handler_factory(); 110 params.http_auth_handler_factory = http_auth_handler_factory();
111 params.network_delegate = network_delegate(); 111 params.network_delegate = network_delegate();
112 params.http_server_properties = http_server_properties(); 112 params.http_server_properties = http_server_properties();
113 params.net_log = net_log(); 113 params.net_log = net_log();
114 context_storage_.set_http_transaction_factory(new HttpCache( 114 context_storage_.set_http_network_session(
115 new HttpNetworkSession(params), 115 make_scoped_ptr(new HttpNetworkSession(params)));
116 HttpCache::DefaultBackend::InMemory(0))); 116 context_storage_.set_http_transaction_factory(
117 new HttpCache(context_storage_.http_network_session(),
118 HttpCache::DefaultBackend::InMemory(0), false));
117 } 119 }
118 // In-memory cookie store. 120 // In-memory cookie store.
119 if (!cookie_store()) 121 if (!cookie_store())
120 context_storage_.set_cookie_store(new CookieMonster(NULL, NULL)); 122 context_storage_.set_cookie_store(new CookieMonster(NULL, NULL));
121 // In-memory Channel ID service. 123 // In-memory Channel ID service.
122 if (!channel_id_service()) { 124 if (!channel_id_service()) {
123 context_storage_.set_channel_id_service(make_scoped_ptr( 125 context_storage_.set_channel_id_service(make_scoped_ptr(
124 new ChannelIDService(new DefaultChannelIDStore(NULL), 126 new ChannelIDService(new DefaultChannelIDStore(NULL),
125 base::WorkerPool::GetTaskRunner(true)))); 127 base::WorkerPool::GetTaskRunner(true))));
126 } 128 }
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 URLRequestJob* job = main_intercept_job_; 631 URLRequestJob* job = main_intercept_job_;
630 main_intercept_job_ = NULL; 632 main_intercept_job_ = NULL;
631 return job; 633 return job;
632 } 634 }
633 635
634 void TestJobInterceptor::set_main_intercept_job(URLRequestJob* job) { 636 void TestJobInterceptor::set_main_intercept_job(URLRequestJob* job) {
635 main_intercept_job_ = job; 637 main_intercept_job_ = job;
636 } 638 }
637 639
638 } // namespace net 640 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698