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

Side by Side Diff: ios/web/shell/shell_url_request_context_getter.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "ios/web/shell/shell_url_request_context_getter.h" 5 #include "ios/web/shell/shell_url_request_context_getter.h"
6 6
7 #include "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 url_request_context_->http_server_properties(); 128 url_request_context_->http_server_properties();
129 network_session_params.host_resolver = 129 network_session_params.host_resolver =
130 url_request_context_->host_resolver(); 130 url_request_context_->host_resolver();
131 131
132 base::FilePath cache_path = base_path_.Append(FILE_PATH_LITERAL("Cache")); 132 base::FilePath cache_path = base_path_.Append(FILE_PATH_LITERAL("Cache"));
133 net::HttpCache::DefaultBackend* main_backend = 133 net::HttpCache::DefaultBackend* main_backend =
134 new net::HttpCache::DefaultBackend(net::DISK_CACHE, 134 new net::HttpCache::DefaultBackend(net::DISK_CACHE,
135 net::CACHE_BACKEND_DEFAULT, 135 net::CACHE_BACKEND_DEFAULT,
136 cache_path, 0, cache_task_runner_); 136 cache_path, 0, cache_task_runner_);
137 137
138 storage_->set_http_network_session(
139 make_scoped_ptr(new net::HttpNetworkSession(network_session_params)));
138 net::HttpCache* main_cache = 140 net::HttpCache* main_cache =
139 new net::HttpCache(network_session_params, main_backend); 141 new net::HttpCache(storage_->http_network_session(), main_backend,
142 true /* set_up_quic_server_info */);
140 storage_->set_http_transaction_factory(main_cache); 143 storage_->set_http_transaction_factory(main_cache);
141 144
142 scoped_ptr<net::URLRequestJobFactoryImpl> job_factory( 145 scoped_ptr<net::URLRequestJobFactoryImpl> job_factory(
143 new net::URLRequestJobFactoryImpl()); 146 new net::URLRequestJobFactoryImpl());
144 bool set_protocol = job_factory->SetProtocolHandler( 147 bool set_protocol = job_factory->SetProtocolHandler(
145 "data", make_scoped_ptr(new net::DataProtocolHandler)); 148 "data", make_scoped_ptr(new net::DataProtocolHandler));
146 DCHECK(set_protocol); 149 DCHECK(set_protocol);
147 150
148 storage_->set_job_factory(job_factory.release()); 151 storage_->set_job_factory(job_factory.release());
149 } 152 }
150 153
151 return url_request_context_.get(); 154 return url_request_context_.get();
152 } 155 }
153 156
154 scoped_refptr<base::SingleThreadTaskRunner> 157 scoped_refptr<base::SingleThreadTaskRunner>
155 ShellURLRequestContextGetter::GetNetworkTaskRunner() const { 158 ShellURLRequestContextGetter::GetNetworkTaskRunner() const {
156 return network_task_runner_; 159 return network_task_runner_;
157 } 160 }
158 161
159 } // namespace web 162 } // namespace web
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698