BASELINE: Update Chromium to 61.0.3163.99

Change-Id: I8452f34574d88ca2b27af9bd56fc9ff3f16b1367
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 11 insertions, 14 deletions

diff --git a/chromium/net/http/bidirectional_stream_unittest.cc b/chromium/net/http/bidirectional_stream_unittest.cc
index 2f1bde1fa65..2cc6b3d1aeb 100644
--- a/chromium/net/http/bidirectional_stream_unittest.cc
+++ b/chromium/net/http/bidirectional_stream_unittest.cc
@@ -184,9 +184,7 @@ class TestDelegateBase : public BidirectionalStream::Delegate {
   void SendData(const scoped_refptr<IOBuffer>& data,
                 int length,
                 bool end_of_stream) {
-    not_expect_callback_ = true;
-    stream_->SendData(data, length, end_of_stream);
-    not_expect_callback_ = false;
+    SendvData({data}, {length}, end_of_stream);
   }
 
   void SendvData(const std::vector<scoped_refptr<IOBuffer>>& data,
@@ -388,7 +386,7 @@ class MockTimer : public base::MockTimer {
 
 }  // namespace
 
-class BidirectionalStreamTest : public testing::TestWithParam<bool> {
+class BidirectionalStreamTest : public testing::Test {
  public:
   BidirectionalStreamTest()
       : default_url_(kDefaultUrl),
@@ -420,8 +418,7 @@ class BidirectionalStreamTest : public testing::TestWithParam<bool> {
     session_deps_.socket_factory->AddSocketDataProvider(sequenced_data_.get());
     session_deps_.net_log = net_log_.bound().net_log();
     http_session_ = SpdySessionDependencies::SpdyCreateSession(&session_deps_);
-    session_ =
-        CreateSecureSpdySession(http_session_.get(), key_, net_log_.bound());
+    session_ = CreateSpdySession(http_session_.get(), key_, net_log_.bound());
   }
 
   BoundTestNetLog net_log_;
@@ -445,9 +442,9 @@ TEST_F(BidirectionalStreamTest, CreateInsecureStream) {
   request_info->url = GURL("http://www.example.org/");
 
   TestDelegateBase delegate(nullptr, 0);
-  HttpNetworkSession::Params params =
-      SpdySessionDependencies::CreateSessionParams(&session_deps_);
-  std::unique_ptr<HttpNetworkSession> session(new HttpNetworkSession(params));
+  std::unique_ptr<HttpNetworkSession> session(new HttpNetworkSession(
+      SpdySessionDependencies::CreateSessionParams(&session_deps_),
+      SpdySessionDependencies::CreateSessionContext(&session_deps_)));
   delegate.SetRunUntilCompletion(true);
   delegate.Start(std::move(request_info), session.get());
 
@@ -566,9 +563,9 @@ TEST_F(BidirectionalStreamTest,
   request_info->url = GURL("http://www.example.org/");
 
   std::unique_ptr<TestDelegateBase> delegate(new TestDelegateBase(nullptr, 0));
-  HttpNetworkSession::Params params =
-      SpdySessionDependencies::CreateSessionParams(&session_deps_);
-  std::unique_ptr<HttpNetworkSession> session(new HttpNetworkSession(params));
+  std::unique_ptr<HttpNetworkSession> session(new HttpNetworkSession(
+      SpdySessionDependencies::CreateSessionParams(&session_deps_),
+      SpdySessionDependencies::CreateSessionContext(&session_deps_)));
   delegate->Start(std::move(request_info), session.get());
   // Reset stream right before the OnFailed task is executed.
   delegate.reset();
@@ -769,7 +766,7 @@ TEST_F(BidirectionalStreamTest, TestNetLogContainEntries) {
       entries, index, NetLogEventType::BIDIRECTIONAL_STREAM_RECV_TRAILERS,
       NetLogEventPhase::NONE);
   index = ExpectLogContainsSomewhere(
-      entries, index, NetLogEventType::BIDIRECTIONAL_STREAM_SEND_DATA,
+      entries, index, NetLogEventType::BIDIRECTIONAL_STREAM_SENDV_DATA,
       NetLogEventPhase::NONE);
   index = ExpectLogContainsSomewhere(
       entries, index, NetLogEventType::BIDIRECTIONAL_STREAM_READ_DATA,
@@ -1660,7 +1657,7 @@ TEST_F(BidirectionalStreamTest, TestHonorAlternativeServiceHeader) {
   ASSERT_EQ(1u, alternative_service_info_vector.size());
   AlternativeService alternative_service(kProtoQUIC, "www.example.org", 443);
   EXPECT_EQ(alternative_service,
-            alternative_service_info_vector[0].alternative_service);
+            alternative_service_info_vector[0].alternative_service());
 }
 
 }  // namespace net