Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "net/http/http_stream_factory_impl_request.h" | 5 #include "net/http/http_stream_factory_impl_request.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 25 | 25 |
| 26 // Make sure that Request passes on its priority updates to its jobs. | 26 // Make sure that Request passes on its priority updates to its jobs. |
| 27 TEST_F(HttpStreamFactoryImplRequestTest, SetPriority) { | 27 TEST_F(HttpStreamFactoryImplRequestTest, SetPriority) { |
| 28 SpdySessionDependencies session_deps(ProxyService::CreateDirect()); | 28 SpdySessionDependencies session_deps(ProxyService::CreateDirect()); |
| 29 std::unique_ptr<HttpNetworkSession> session = | 29 std::unique_ptr<HttpNetworkSession> session = |
| 30 SpdySessionDependencies::SpdyCreateSession(&session_deps); | 30 SpdySessionDependencies::SpdyCreateSession(&session_deps); |
| 31 HttpStreamFactoryImpl* factory = | 31 HttpStreamFactoryImpl* factory = |
| 32 static_cast<HttpStreamFactoryImpl*>(session->http_stream_factory()); | 32 static_cast<HttpStreamFactoryImpl*>(session->http_stream_factory()); |
| 33 MockHttpStreamRequestDelegate request_delegate; | 33 MockHttpStreamRequestDelegate request_delegate; |
| 34 TestJobFactory job_factory; | 34 TestJobFactory job_factory; |
| 35 HttpRequestInfo request_info; | |
| 35 HttpStreamFactoryImpl::JobController* job_controller = | 36 HttpStreamFactoryImpl::JobController* job_controller = |
| 36 new HttpStreamFactoryImpl::JobController(factory, &request_delegate, | 37 new HttpStreamFactoryImpl::JobController( |
| 37 session.get(), &job_factory); | 38 factory, &request_delegate, session.get(), &job_factory, request_info, |
| 39 /*is_preconnect=*/false); | |
| 38 factory->job_controller_set_.insert(base::WrapUnique(job_controller)); | 40 factory->job_controller_set_.insert(base::WrapUnique(job_controller)); |
|
Bence
2017/01/28 02:08:25
I really like your change in http_stream_factory_i
xunjieli
2017/01/30 14:08:39
Done.
| |
| 39 | 41 |
| 40 HttpRequestInfo request_info; | |
| 41 std::unique_ptr<HttpStreamFactoryImpl::Request> request( | 42 std::unique_ptr<HttpStreamFactoryImpl::Request> request( |
| 42 job_controller->Start(request_info, &request_delegate, nullptr, | 43 job_controller->Start(request_info, &request_delegate, nullptr, |
| 43 NetLogWithSource(), HttpStreamRequest::HTTP_STREAM, | 44 NetLogWithSource(), HttpStreamRequest::HTTP_STREAM, |
| 44 DEFAULT_PRIORITY, SSLConfig(), SSLConfig())); | 45 DEFAULT_PRIORITY, SSLConfig(), SSLConfig())); |
| 45 EXPECT_TRUE(job_controller->main_job()); | 46 EXPECT_TRUE(job_controller->main_job()); |
| 46 EXPECT_EQ(DEFAULT_PRIORITY, job_controller->main_job()->priority()); | 47 EXPECT_EQ(DEFAULT_PRIORITY, job_controller->main_job()->priority()); |
| 47 | 48 |
| 48 request->SetPriority(MEDIUM); | 49 request->SetPriority(MEDIUM); |
| 49 EXPECT_EQ(MEDIUM, job_controller->main_job()->priority()); | 50 EXPECT_EQ(MEDIUM, job_controller->main_job()->priority()); |
| 50 | 51 |
| 51 EXPECT_CALL(request_delegate, OnStreamFailed(_, _)).Times(1); | 52 EXPECT_CALL(request_delegate, OnStreamFailed(_, _)).Times(1); |
| 52 job_controller->OnStreamFailed(job_factory.main_job(), ERR_FAILED, | 53 job_controller->OnStreamFailed(job_factory.main_job(), ERR_FAILED, |
| 53 SSLConfig()); | 54 SSLConfig()); |
| 54 | 55 |
| 55 request->SetPriority(IDLE); | 56 request->SetPriority(IDLE); |
| 56 EXPECT_EQ(IDLE, job_controller->main_job()->priority()); | 57 EXPECT_EQ(IDLE, job_controller->main_job()->priority()); |
| 57 } | 58 } |
| 58 } // namespace net | 59 } // namespace net |
| OLD | NEW |