Index: chrome/browser/local_discovery/privet_http_asynchronous_factory_impl.h |
diff --git a/chrome/browser/local_discovery/privet_http_asynchronous_factory_impl.h b/chrome/browser/local_discovery/privet_http_asynchronous_factory_impl.h |
index 243e7759cafbb5698f7760907afb735d7de43a81..520a66ba09e19a7a2847dfae180e45e3cf78eb84 100644 |
--- a/chrome/browser/local_discovery/privet_http_asynchronous_factory_impl.h |
+++ b/chrome/browser/local_discovery/privet_http_asynchronous_factory_impl.h |
@@ -20,33 +20,31 @@ class PrivetHTTPAsynchronousFactoryImpl : public PrivetHTTPAsynchronousFactory { |
~PrivetHTTPAsynchronousFactoryImpl() override; |
scoped_ptr<PrivetHTTPResolution> CreatePrivetHTTP( |
- const std::string& name, |
- const net::HostPortPair& address, |
- const ResultCallback& callback) override; |
+ const std::string& service_name) override; |
private: |
class ResolutionImpl : public PrivetHTTPResolution { |
public: |
- ResolutionImpl(const std::string& name, |
- const net::HostPortPair& address, |
- const ResultCallback& callback, |
+ ResolutionImpl(const std::string& service_name, |
net::URLRequestContextGetter* request_context); |
~ResolutionImpl() override; |
- void Start() override; |
+ void Start(const net::HostPortPair& address, |
+ const ResultCallback& callback) override; |
+ |
const std::string& GetName() override; |
private: |
- void ResolveComplete(bool success, |
- const net::IPAddressNumber& address_ipv4, |
- const net::IPAddressNumber& address_ipv6); |
+ void DomainResolveComplete(uint16 port, |
+ const ResultCallback& callback, |
+ bool success, |
+ const net::IPAddressNumber& address_ipv4, |
+ const net::IPAddressNumber& address_ipv6); |
std::string name_; |
- scoped_ptr<LocalDomainResolver> resolver_; |
- net::HostPortPair hostport_; |
- ResultCallback callback_; |
scoped_refptr<net::URLRequestContextGetter> request_context_; |
scoped_refptr<ServiceDiscoverySharedClient> service_discovery_client_; |
+ scoped_ptr<LocalDomainResolver> domain_resolver_; |
}; |
scoped_refptr<net::URLRequestContextGetter> request_context_; |