| Index: chrome/browser/net/predictor.cc
|
| diff --git a/chrome/browser/net/predictor.cc b/chrome/browser/net/predictor.cc
|
| index c09cdc4e8a7d1707fde88bc71388054812935a19..236316d7d20f3c01f9324e2357906226eb3bd81c 100644
|
| --- a/chrome/browser/net/predictor.cc
|
| +++ b/chrome/browser/net/predictor.cc
|
| @@ -33,21 +33,20 @@
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "components/pref_registry/pref_registry_syncable.h"
|
| #include "components/prefs/pref_service.h"
|
| #include "components/prefs/scoped_user_pref_update.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/resource_hints.h"
|
| #include "net/base/address_list.h"
|
| #include "net/base/completion_callback.h"
|
| #include "net/base/host_port_pair.h"
|
| -#include "net/base/load_flags.h"
|
| #include "net/base/net_errors.h"
|
| #include "net/dns/host_resolver.h"
|
| #include "net/dns/single_request_host_resolver.h"
|
| #include "net/http/transport_security_state.h"
|
| #include "net/log/net_log.h"
|
| #include "net/proxy/proxy_info.h"
|
| #include "net/proxy/proxy_service.h"
|
| #include "net/ssl/ssl_config_service.h"
|
| #include "net/url_request/url_request_context.h"
|
| #include "net/url_request/url_request_context_getter.h"
|
| @@ -954,21 +953,21 @@ void Predictor::LookupFinished(const GURL& url, bool found) {
|
| info->SetNoSuchNameState();
|
| }
|
| }
|
|
|
| bool Predictor::WouldLikelyProxyURL(const GURL& url) {
|
| if (!proxy_service_)
|
| return false;
|
|
|
| net::ProxyInfo info;
|
| bool synchronous_success = proxy_service_->TryResolveProxySynchronously(
|
| - url, std::string(), net::LOAD_NORMAL, &info, nullptr, net::BoundNetLog());
|
| + url, std::string(), &info, nullptr, net::BoundNetLog());
|
|
|
| return synchronous_success && !info.is_direct();
|
| }
|
|
|
| UrlInfo* Predictor::AppendToResolutionQueue(
|
| const GURL& url,
|
| UrlInfo::ResolutionMotivation motivation) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
| DCHECK(url.has_host());
|
|
|
|
|