diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-05 14:08:31 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-11 07:46:53 +0000 |
| commit | 6a4cabb866f66d4128a97cdc6d9d08ce074f1247 (patch) | |
| tree | ab00f70a5e89278d6a0d16ff0c42578dc4d84a2d /chromium/net/http/http_proxy_client_socket.cc | |
| parent | e733310db58160074f574c429d48f8308c0afe17 (diff) | |
| download | qtwebengine-chromium-6a4cabb866f66d4128a97cdc6d9d08ce074f1247.tar.gz | |
BASELINE: Update Chromium to 57.0.2987.144
Change-Id: I29db402ff696c71a04c4dbaec822c2e53efe0267
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/net/http/http_proxy_client_socket.cc')
| -rw-r--r-- | chromium/net/http/http_proxy_client_socket.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chromium/net/http/http_proxy_client_socket.cc b/chromium/net/http/http_proxy_client_socket.cc index 82538dff80e..ed8c8d3fb60 100644 --- a/chromium/net/http/http_proxy_client_socket.cc +++ b/chromium/net/http/http_proxy_client_socket.cc @@ -8,7 +8,6 @@ #include "base/bind_helpers.h" #include "base/profiler/scoped_tracker.h" #include "base/strings/string_util.h" -#include "base/strings/stringprintf.h" #include "base/values.h" #include "net/base/auth.h" #include "net/base/host_port_pair.h" @@ -175,9 +174,9 @@ bool HttpProxyClientSocket::WasEverUsed() const { return false; } -bool HttpProxyClientSocket::WasNpnNegotiated() const { +bool HttpProxyClientSocket::WasAlpnNegotiated() const { if (transport_.get() && transport_->socket()) { - return transport_->socket()->WasNpnNegotiated(); + return transport_->socket()->WasAlpnNegotiated(); } NOTREACHED(); return false; |