chrome/browser/extensions/api/dns/dns_api.cc - Issue 10309002: Reimplements net::AddressList without struct addrinfo.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/dns/dns_api.cc

Issue 10309002: Reimplements net::AddressList without struct addrinfo. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: get_canonical_name -> canonical_name. iterator to indexing Created 8 years, 7 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:

Index: chrome/browser/extensions/api/dns/dns_api.cc

diff --git a/chrome/browser/extensions/api/dns/dns_api.cc b/chrome/browser/extensions/api/dns/dns_api.cc

index 44c4064130f792f3c5f133cbbd9b2ee6021ff8a8..2c5e51a9f6cb191356e9e4c94923923fa9f21a3d 100644

--- a/chrome/browser/extensions/api/dns/dns_api.cc

+++ b/chrome/browser/extensions/api/dns/dns_api.cc

@@ -12,7 +12,6 @@

#include "content/public/browser/browser_thread.h"

#include "net/base/host_port_pair.h"

#include "net/base/net_errors.h"

-#include "net/base/net_util.h"

using content::BrowserThread;

using extensions::api::experimental_dns::ResolveCallbackResolveInfo;

@@ -96,10 +95,9 @@ void DnsResolveFunction::OnLookupFinished(int resolve_result) {

new ResolveCallbackResolveInfo());

resolve_info->result_code = resolve_result;

if (resolve_result == net::OK) {

- const struct addrinfo* head = addresses_->head();

- DCHECK(head);

+ DCHECK(!addresses_->empty());

resolve_info->address.reset(

- new std::string(net::NetAddressToString(head)));

+ new std::string(addresses_->front().ToStringWithoutPort()));

}

result_.reset(Resolve::Result::Create(*resolve_info));

response_ = true;