From 39d357e3248f80abea0159765ff39554affb40db Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Wed, 4 Jan 2017 14:17:57 +0100
Subject: BASELINE: Update Chromium to 55.0.2883.105
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

And updates ninja to 1.7.2

Change-Id: I20d43c737f82764d857ada9a55586901b18b9243
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
---
 chromium/net/http/http_basic_stream.cc | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'chromium/net/http/http_basic_stream.cc')

diff --git a/chromium/net/http/http_basic_stream.cc b/chromium/net/http/http_basic_stream.cc
index a82f9fccaf4..c805d7cf989 100644
--- a/chromium/net/http/http_basic_stream.cc
+++ b/chromium/net/http/http_basic_stream.cc
@@ -4,7 +4,7 @@
 
 #include "net/http/http_basic_stream.h"
 
-#include <memory>
+#include <utility>
 
 #include "net/http/http_request_info.h"
 #include "net/http/http_response_body_drainer.h"
@@ -13,15 +13,18 @@
 
 namespace net {
 
-HttpBasicStream::HttpBasicStream(ClientSocketHandle* connection,
-                                 bool using_proxy)
-    : state_(connection, using_proxy) {}
+HttpBasicStream::HttpBasicStream(std::unique_ptr<ClientSocketHandle> connection,
+                                 bool using_proxy,
+                                 bool http_09_on_non_default_ports_enabled)
+    : state_(std::move(connection),
+             using_proxy,
+             http_09_on_non_default_ports_enabled) {}
 
 HttpBasicStream::~HttpBasicStream() {}
 
 int HttpBasicStream::InitializeStream(const HttpRequestInfo* request_info,
                                       RequestPriority priority,
-                                      const BoundNetLog& net_log,
+                                      const NetLogWithSource& net_log,
                                       const CompletionCallback& callback) {
   state_.Initialize(request_info, priority, net_log, callback);
   return OK;
@@ -35,10 +38,6 @@ int HttpBasicStream::SendRequest(const HttpRequestHeaders& headers,
       state_.GenerateRequestLine(), headers, response, callback);
 }
 
-UploadProgress HttpBasicStream::GetUploadProgress() const {
-  return parser()->GetUploadProgress();
-}
-
 int HttpBasicStream::ReadResponseHeaders(const CompletionCallback& callback) {
   return parser()->ReadResponseHeaders(callback);
 }
@@ -60,8 +59,8 @@ HttpStream* HttpBasicStream::RenewStreamForAuth() {
   // be extra-sure it doesn't touch the connection again, delete it here rather
   // than leaving it until the destructor is called.
   state_.DeleteParser();
-  return new HttpBasicStream(state_.ReleaseConnection().release(),
-                             state_.using_proxy());
+  return new HttpBasicStream(state_.ReleaseConnection(), state_.using_proxy(),
+                             state_.http_09_on_non_default_ports_enabled());
 }
 
 bool HttpBasicStream::IsResponseBodyComplete() const {
@@ -112,9 +111,10 @@ bool HttpBasicStream::GetRemoteEndpoint(IPEndPoint* endpoint) {
   return state_.connection()->socket()->GetPeerAddress(endpoint) == OK;
 }
 
-Error HttpBasicStream::GetSignedEKMForTokenBinding(crypto::ECPrivateKey* key,
-                                                   std::vector<uint8_t>* out) {
-  return parser()->GetSignedEKMForTokenBinding(key, out);
+Error HttpBasicStream::GetTokenBindingSignature(crypto::ECPrivateKey* key,
+                                                TokenBindingType tb_type,
+                                                std::vector<uint8_t>* out) {
+  return parser()->GetTokenBindingSignature(key, tb_type, out);
 }
 
 void HttpBasicStream::Drain(HttpNetworkSession* session) {
-- 
cgit v1.2.1