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

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: test Created 5 years, 2 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
« no previous file with comments | « net/url_request/url_request_context_storage.cc ('k') | net/url_request/url_request_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 params.client_socket_factory = client_socket_factory(); 101 params.client_socket_factory = client_socket_factory();
102 params.host_resolver = host_resolver(); 102 params.host_resolver = host_resolver();
103 params.cert_verifier = cert_verifier(); 103 params.cert_verifier = cert_verifier();
104 params.transport_security_state = transport_security_state(); 104 params.transport_security_state = transport_security_state();
105 params.proxy_service = proxy_service(); 105 params.proxy_service = proxy_service();
106 params.ssl_config_service = ssl_config_service(); 106 params.ssl_config_service = ssl_config_service();
107 params.http_auth_handler_factory = http_auth_handler_factory(); 107 params.http_auth_handler_factory = http_auth_handler_factory();
108 params.network_delegate = network_delegate(); 108 params.network_delegate = network_delegate();
109 params.http_server_properties = http_server_properties(); 109 params.http_server_properties = http_server_properties();
110 params.net_log = net_log(); 110 params.net_log = net_log();
111 context_storage_.set_http_transaction_factory( 111 context_storage_.set_http_network_session(
112 make_scoped_ptr(new HttpCache(new HttpNetworkSession(params), 112 make_scoped_ptr(new HttpNetworkSession(params)));
113 HttpCache::DefaultBackend::InMemory(0))) 113 context_storage_.set_http_transaction_factory(make_scoped_ptr(
114 .Pass()); 114 new HttpCache(context_storage_.http_network_session(),
115 HttpCache::DefaultBackend::InMemory(0), false)));
115 } 116 }
116 // In-memory cookie store. 117 // In-memory cookie store.
117 if (!cookie_store()) 118 if (!cookie_store())
118 context_storage_.set_cookie_store(new CookieMonster(NULL, NULL)); 119 context_storage_.set_cookie_store(new CookieMonster(NULL, NULL));
119 // In-memory Channel ID service. 120 // In-memory Channel ID service.
120 if (!channel_id_service()) { 121 if (!channel_id_service()) {
121 context_storage_.set_channel_id_service(make_scoped_ptr( 122 context_storage_.set_channel_id_service(make_scoped_ptr(
122 new ChannelIDService(new DefaultChannelIDStore(NULL), 123 new ChannelIDService(new DefaultChannelIDStore(NULL),
123 base::WorkerPool::GetTaskRunner(true)))); 124 base::WorkerPool::GetTaskRunner(true))));
124 } 125 }
(...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 URLRequestJob* job = main_intercept_job_; 637 URLRequestJob* job = main_intercept_job_;
637 main_intercept_job_ = NULL; 638 main_intercept_job_ = NULL;
638 return job; 639 return job;
639 } 640 }
640 641
641 void TestJobInterceptor::set_main_intercept_job(URLRequestJob* job) { 642 void TestJobInterceptor::set_main_intercept_job(URLRequestJob* job) {
642 main_intercept_job_ = job; 643 main_intercept_job_ = job;
643 } 644 }
644 645
645 } // namespace net 646 } // namespace net
OLDNEW
« no previous file with comments | « net/url_request/url_request_context_storage.cc ('k') | net/url_request/url_request_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698