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

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

Issue 2351513002: net: rename BoundNetLog to NetLogWithSource (Closed)
Patch Set: one more fix, content bound_net_log_ Created 4 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 "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 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 net::HostResolver::RequestInfo request_info(host_port_pair); 206 net::HostResolver::RequestInfo request_info(host_port_pair);
207 int resolve_result = host_resolver->Resolve( 207 int resolve_result = host_resolver->Resolve(
208 request_info, net::DEFAULT_PRIORITY, &addresses_, 208 request_info, net::DEFAULT_PRIORITY, &addresses_,
209 base::Bind(&SocketExtensionWithDnsLookupFunction::OnDnsLookup, this), 209 base::Bind(&SocketExtensionWithDnsLookupFunction::OnDnsLookup, this),
210 &request_, net::BoundNetLog()); 210 &request_, net::NetLogWithSource());
211 211
212 if (resolve_result != net::ERR_IO_PENDING) 212 if (resolve_result != net::ERR_IO_PENDING)
213 OnDnsLookup(resolve_result); 213 OnDnsLookup(resolve_result);
214 } 214 }
215 215
216 void SocketExtensionWithDnsLookupFunction::OnDnsLookup(int resolve_result) { 216 void SocketExtensionWithDnsLookupFunction::OnDnsLookup(int resolve_result) {
217 if (resolve_result == net::OK) { 217 if (resolve_result == net::OK) {
218 DCHECK(!addresses_.empty()); 218 DCHECK(!addresses_.empty());
219 } else { 219 } else {
220 error_ = kDnsLookupFailedError; 220 error_ = kDnsLookupFailedError;
(...skipping 868 matching lines...) Expand 10 before | Expand all | Expand 10 after
1089 } else { 1089 } else {
1090 RemoveSocket(params_->socket_id); 1090 RemoveSocket(params_->socket_id);
1091 error_ = net::ErrorToString(result); 1091 error_ = net::ErrorToString(result);
1092 } 1092 }
1093 1093
1094 results_ = api::socket::Secure::Results::Create(result); 1094 results_ = api::socket::Secure::Results::Create(result);
1095 AsyncWorkCompleted(); 1095 AsyncWorkCompleted();
1096 } 1096 }
1097 1097
1098 } // namespace extensions 1098 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698