Revert "Revert CLs landed in HttpStreamFactoryImpl to track down a crasher"

net/http/http_stream_factory_impl_request_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/http/http_stream_factory_impl_request.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "net/http/http_stream_factory_impl.h"
 #include "net/http/http_stream_factory_impl_job.h"
 #include "net/http/http_stream_factory_impl_job_controller.h"
 #include "net/http/http_stream_factory_test_util.h"
 #include "net/proxy/proxy_info.h"
 #include "net/proxy/proxy_service.h"
 #include "net/spdy/chromium/spdy_test_util_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 
 namespace net {
 
 class HttpStreamFactoryImplRequestTest : public ::testing::Test {};
 
 // Make sure that Request passes on its priority updates to its jobs.
 TEST_F(HttpStreamFactoryImplRequestTest, SetPriority) {
+  SequencedSocketData data(nullptr, 0, nullptr, 0);
+  data.set_connect_data(MockConnect(ASYNC, OK));
+  auto ssl_data = base::MakeUnique<SSLSocketDataProvider>(ASYNC, OK);
   SpdySessionDependencies session_deps(ProxyService::CreateDirect());
+  session_deps.socket_factory->AddSocketDataProvider(&data);
+  session_deps.socket_factory->AddSSLSocketDataProvider(ssl_data.get());
+
   std::unique_ptr<HttpNetworkSession> session =
       SpdySessionDependencies::SpdyCreateSession(&session_deps);
   HttpStreamFactoryImpl* factory =
       static_cast<HttpStreamFactoryImpl*>(session->http_stream_factory());
   MockHttpStreamRequestDelegate request_delegate;
   TestJobFactory job_factory;
   HttpRequestInfo request_info;
+  request_info.url = GURL("http://www.example.com/");
   auto job_controller = base::MakeUnique<HttpStreamFactoryImpl::JobController>(
       factory, &request_delegate, session.get(), &job_factory, request_info,
       /* is_preconnect = */ false,
       /* enable_ip_based_pooling = */ true,
-      /* enable_alternative_services = */ true);
+      /* enable_alternative_services = */ true, SSLConfig(), SSLConfig());
   HttpStreamFactoryImpl::JobController* job_controller_raw_ptr =
       job_controller.get();
   factory->job_controller_set_.insert(std::move(job_controller));
 
   std::unique_ptr<HttpStreamFactoryImpl::Request> request(
       job_controller_raw_ptr->Start(
-          request_info, &request_delegate, nullptr, NetLogWithSource(),
-          HttpStreamRequest::HTTP_STREAM, DEFAULT_PRIORITY, SSLConfig(),
-          SSLConfig()));
+          &request_delegate, nullptr, NetLogWithSource(),
+          HttpStreamRequest::HTTP_STREAM, DEFAULT_PRIORITY));
   EXPECT_TRUE(job_controller_raw_ptr->main_job());
   EXPECT_EQ(DEFAULT_PRIORITY, job_controller_raw_ptr->main_job()->priority());
 
   request->SetPriority(MEDIUM);
   EXPECT_EQ(MEDIUM, job_controller_raw_ptr->main_job()->priority());
 
   EXPECT_CALL(request_delegate, OnStreamFailed(_, _)).Times(1);
   job_controller_raw_ptr->OnStreamFailed(job_factory.main_job(), ERR_FAILED,
                                          SSLConfig());
 
   request->SetPriority(IDLE);
   EXPECT_EQ(IDLE, job_controller_raw_ptr->main_job()->priority());
+  EXPECT_TRUE(data.AllReadDataConsumed());
+  EXPECT_TRUE(data.AllWriteDataConsumed());
 }
 }  // namespace net