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

Side by Side Diff: extensions/browser/api/socket/socket_api.cc

Issue 2116983002: Change HostResolver::Resolve() to take an std::unique_ptr<Request>* rather than a RequestHandle* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: http_stream_factory_impl_job_controller_unittest RequestHandle* to unique_ptr Created 4 years, 4 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 "extensions/browser/api/socket/socket_api.h" 5 #include "extensions/browser/api/socket/socket_api.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 resource_context_ = browser_context()->GetResourceContext(); 196 resource_context_ = browser_context()->GetResourceContext();
197 return resource_context_ != NULL; 197 return resource_context_ != NULL;
198 } 198 }
199 199
200 void SocketExtensionWithDnsLookupFunction::StartDnsLookup( 200 void SocketExtensionWithDnsLookupFunction::StartDnsLookup(
201 const net::HostPortPair& host_port_pair) { 201 const net::HostPortPair& host_port_pair) {
202 net::HostResolver* host_resolver = 202 net::HostResolver* host_resolver =
203 HostResolverWrapper::GetInstance()->GetHostResolver(resource_context_); 203 HostResolverWrapper::GetInstance()->GetHostResolver(resource_context_);
204 DCHECK(host_resolver); 204 DCHECK(host_resolver);
205 205
206 // RequestHandle is not needed because we never need to cancel requests.
207 net::HostResolver::RequestHandle request_handle;
208
209 net::HostResolver::RequestInfo request_info(host_port_pair); 206 net::HostResolver::RequestInfo request_info(host_port_pair);
210 int resolve_result = host_resolver->Resolve( 207 int resolve_result = host_resolver->Resolve(
211 request_info, net::DEFAULT_PRIORITY, &addresses_, 208 request_info, net::DEFAULT_PRIORITY, &addresses_,
212 base::Bind(&SocketExtensionWithDnsLookupFunction::OnDnsLookup, this), 209 base::Bind(&SocketExtensionWithDnsLookupFunction::OnDnsLookup, this),
213 &request_handle, net::BoundNetLog()); 210 &request_, net::BoundNetLog());
214 211
215 if (resolve_result != net::ERR_IO_PENDING) 212 if (resolve_result != net::ERR_IO_PENDING)
216 OnDnsLookup(resolve_result); 213 OnDnsLookup(resolve_result);
217 } 214 }
218 215
219 void SocketExtensionWithDnsLookupFunction::OnDnsLookup(int resolve_result) { 216 void SocketExtensionWithDnsLookupFunction::OnDnsLookup(int resolve_result) {
220 if (resolve_result == net::OK) { 217 if (resolve_result == net::OK) {
221 DCHECK(!addresses_.empty()); 218 DCHECK(!addresses_.empty());
222 } else { 219 } else {
223 error_ = kDnsLookupFailedError; 220 error_ = kDnsLookupFailedError;
(...skipping 868 matching lines...) Expand 10 before | Expand all | Expand 10 after
1092 } else { 1089 } else {
1093 RemoveSocket(params_->socket_id); 1090 RemoveSocket(params_->socket_id);
1094 error_ = net::ErrorToString(result); 1091 error_ = net::ErrorToString(result);
1095 } 1092 }
1096 1093
1097 results_ = api::socket::Secure::Results::Create(result); 1094 results_ = api::socket::Secure::Results::Create(result);
1098 AsyncWorkCompleted(); 1095 AsyncWorkCompleted();
1099 } 1096 }
1100 1097
1101 } // namespace extensions 1098 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698