| Index: content/browser/loader/resource_hints_impl.cc
|
| diff --git a/content/browser/loader/resource_hints_impl.cc b/content/browser/loader/resource_hints_impl.cc
|
| index 694947881e67296fa2fa2d6ebdb829da9de7eedb..e6f18c00346c3c0139c406a7862fe7b0ea14131c 100644
|
| --- a/content/browser/loader/resource_hints_impl.cc
|
| +++ b/content/browser/loader/resource_hints_impl.cc
|
| @@ -2,30 +2,48 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "content/public/browser/resource_hints.h"
|
| -
|
| +#include "base/memory/ptr_util.h"
|
| +#include "base/memory/ref_counted.h"
|
| #include "content/public/browser/browser_thread.h"
|
| +#include "content/public/browser/resource_context.h"
|
| +#include "content/public/browser/resource_hints.h"
|
| +#include "net/base/address_list.h"
|
| #include "net/base/load_flags.h"
|
| +#include "net/dns/host_resolver.h"
|
| +#include "net/dns/single_request_host_resolver.h"
|
| #include "net/http/http_network_session.h"
|
| #include "net/http/http_request_info.h"
|
| #include "net/http/http_stream_factory.h"
|
| #include "net/http/http_transaction_factory.h"
|
| #include "net/url_request/http_user_agent_settings.h"
|
| #include "net/url_request/url_request_context.h"
|
| -#include "net/url_request/url_request_context_getter.h"
|
|
|
| namespace content {
|
|
|
| -void PreconnectUrl(net::URLRequestContextGetter* getter,
|
| +namespace {
|
| +
|
| +// Note that the lifetime of |request| and |addresses| is managed by the caller.
|
| +void OnResolveComplete(net::SingleRequestHostResolver* request,
|
| + net::AddressList* addresses,
|
| + const net::CompletionCallback& callback,
|
| + int result) {
|
| + // Plumb the resolution result into the callback if future consumers want
|
| + // that information.
|
| + callback.Run(result);
|
| +}
|
| +
|
| +} // namespace
|
| +
|
| +void PreconnectUrl(content::ResourceContext* resource_context,
|
| const GURL& url,
|
| const GURL& first_party_for_cookies,
|
| int count,
|
| bool allow_credentials,
|
| net::HttpRequestInfo::RequestMotivation motivation) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| - DCHECK(getter);
|
| + DCHECK(resource_context);
|
|
|
| - net::URLRequestContext* context = getter->GetURLRequestContext();
|
| + net::URLRequestContext* context = resource_context->GetRequestContext();
|
| net::HttpTransactionFactory* factory = context->http_transaction_factory();
|
| net::HttpNetworkSession* session = factory->GetSession();
|
|
|
| @@ -57,4 +75,20 @@ void PreconnectUrl(net::URLRequestContextGetter* getter,
|
| http_stream_factory->PreconnectStreams(count, request_info);
|
| }
|
|
|
| +int PreresolveUrl(content::ResourceContext* resource_context,
|
| + const GURL& url,
|
| + const net::CompletionCallback& callback) {
|
| + DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| + DCHECK(resource_context);
|
| +
|
| + net::AddressList* addresses = new net::AddressList;
|
| + net::SingleRequestHostResolver* resolver =
|
| + new net::SingleRequestHostResolver(resource_context->GetHostResolver());
|
| + net::HostResolver::RequestInfo resolve_info(net::HostPortPair::FromURL(url));
|
| + return resolver->Resolve(resolve_info, net::IDLE, addresses,
|
| + base::Bind(&OnResolveComplete, base::Owned(resolver),
|
| + base::Owned(addresses), callback),
|
| + net::BoundNetLog());
|
| +}
|
| +
|
| } // namespace content
|
|
|