Commit 367b731b authored by Ryan Hamilton's avatar Ryan Hamilton Committed by Commit Bot

Roll src/net/third_party/quiche/src/ 0220865bf..b417d60c0 (7 commits)

https://quiche.googlesource.com/quiche.git/+log/0220865bffc1..b417d60c04d8

$ git log 0220865bf..b417d60c0 --date=short --no-merges --format='%ad %ae %s'
2019-05-29 dschinazi Add a client connection ID to version negotiation packet creation
2019-05-29 dschinazi Add quic_no_framer_object_in_dispatcher to QuicVersionInitializeSupportForIetfDraft
2019-05-28 dschinazi Prepare tests and fuzzer for client connection IDs
2019-05-28 dschinazi Rename QUIC connection ID to server connection ID, part 2
2019-05-28 fayang gfe-relnote: In QUIC, only decrease cwnd gain and pacing gain when cwnd increases or allow cwnd to decrease in initial cwnd experiment. Protected by gfe2_reloadable_flag_quic_gfe_selected_initial_cwnd_experiments and ENABLED quic_fix_bbr_cwnd_in_bandwidth_resumption.
2019-05-28 wub gfe-relnote: Remove stateless reject from QUIC. This deprecates two flags in the false position: --gfe2_reloadable_flag_enable_quic_stateless_reject_support and --gfe2_reloadable_flag_quic_use_cheap_stateless_rejects.
2019-05-28 fkastenholz QuicConnection methods call CloseConnection rather than TearDownLocalConnectionState

Created with:
  roll-dep src/net/third_party/quiche/src src/third_party/quic_trace/src

Change-Id: Iebb94aea950f1b966c7b9e5765d0a97c27a0877b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1636395
Commit-Queue: Ryan Hamilton <rch@chromium.org>
Auto-Submit: Ryan Hamilton <rch@chromium.org>
Reviewed-by: default avatarZhongyi Shi <zhongyi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#664593}
parent f3e818ed
...@@ -277,7 +277,7 @@ vars = { ...@@ -277,7 +277,7 @@ vars = {
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed # the commit queue can handle CLs rolling feed
# and whatever else without interference from each other. # and whatever else without interference from each other.
'quiche_revision': '0220865bffc15469c7e76ec9a1c573bcf395afab', 'quiche_revision': 'b417d60c04d847ac676aa4492c79a17fadca509e',
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling ios_webkit # the commit queue can handle CLs rolling ios_webkit
# and whatever else without interference from each other. # and whatever else without interference from each other.
......
...@@ -1667,6 +1667,7 @@ component("net") { ...@@ -1667,6 +1667,7 @@ component("net") {
"third_party/quiche/src/quic/platform/api/quic_mem_slice_storage.h", "third_party/quiche/src/quic/platform/api/quic_mem_slice_storage.h",
"third_party/quiche/src/quic/platform/api/quic_mutex.cc", "third_party/quiche/src/quic/platform/api/quic_mutex.cc",
"third_party/quiche/src/quic/platform/api/quic_mutex.h", "third_party/quiche/src/quic/platform/api/quic_mutex.h",
"third_party/quiche/src/quic/platform/api/quic_optional.h",
"third_party/quiche/src/quic/platform/api/quic_pcc_sender.h", "third_party/quiche/src/quic/platform/api/quic_pcc_sender.h",
"third_party/quiche/src/quic/platform/api/quic_prefetch.h", "third_party/quiche/src/quic/platform/api/quic_prefetch.h",
"third_party/quiche/src/quic/platform/api/quic_ptr_util.h", "third_party/quiche/src/quic/platform/api/quic_ptr_util.h",
...@@ -3164,6 +3165,7 @@ if (is_linux) { ...@@ -3164,6 +3165,7 @@ if (is_linux) {
executable("epoll_quic_client") { executable("epoll_quic_client") {
sources = [ sources = [
"third_party/quiche/src/quic/tools/fake_proof_verifier.h",
"third_party/quiche/src/quic/tools/quic_client_bin.cc", "third_party/quiche/src/quic/tools/quic_client_bin.cc",
"third_party/quiche/src/quic/tools/quic_epoll_client_factory.cc", "third_party/quiche/src/quic/tools/quic_epoll_client_factory.cc",
"third_party/quiche/src/quic/tools/quic_epoll_client_factory.h", "third_party/quiche/src/quic/tools/quic_epoll_client_factory.h",
...@@ -3491,8 +3493,6 @@ source_set("simple_quic_tools") { ...@@ -3491,8 +3493,6 @@ source_set("simple_quic_tools") {
"third_party/quiche/src/quic/core/quic_process_packet_interface.h", "third_party/quiche/src/quic/core/quic_process_packet_interface.h",
"third_party/quiche/src/quic/core/quic_time_wait_list_manager.cc", "third_party/quiche/src/quic/core/quic_time_wait_list_manager.cc",
"third_party/quiche/src/quic/core/quic_time_wait_list_manager.h", "third_party/quiche/src/quic/core/quic_time_wait_list_manager.h",
"third_party/quiche/src/quic/core/stateless_rejector.cc",
"third_party/quiche/src/quic/core/stateless_rejector.h",
"third_party/quiche/src/quic/platform/api/quic_default_proof_providers.h", "third_party/quiche/src/quic/platform/api/quic_default_proof_providers.h",
"third_party/quiche/src/quic/platform/api/quic_system_event_loop.h", "third_party/quiche/src/quic/platform/api/quic_system_event_loop.h",
"third_party/quiche/src/quic/tools/quic_backend_response.cc", "third_party/quiche/src/quic/tools/quic_backend_response.cc",
...@@ -3548,6 +3548,7 @@ source_set("simple_quic_tools") { ...@@ -3548,6 +3548,7 @@ source_set("simple_quic_tools") {
if (!is_ios) { if (!is_ios) {
executable("quic_client") { executable("quic_client") {
sources = [ sources = [
"third_party/quiche/src/quic/tools/fake_proof_verifier.h",
"third_party/quiche/src/quic/tools/quic_toy_client.cc", "third_party/quiche/src/quic/tools/quic_toy_client.cc",
"third_party/quiche/src/quic/tools/quic_toy_client.h", "third_party/quiche/src/quic/tools/quic_toy_client.h",
"tools/quic/quic_simple_client_bin.cc", "tools/quic/quic_simple_client_bin.cc",
...@@ -5414,6 +5415,7 @@ test("net_unittests") { ...@@ -5414,6 +5415,7 @@ test("net_unittests") {
"third_party/quiche/src/quic/core/quic_packet_creator_test.cc", "third_party/quiche/src/quic/core/quic_packet_creator_test.cc",
"third_party/quiche/src/quic/core/quic_packet_generator_test.cc", "third_party/quiche/src/quic/core/quic_packet_generator_test.cc",
"third_party/quiche/src/quic/core/quic_packet_number_test.cc", "third_party/quiche/src/quic/core/quic_packet_number_test.cc",
"third_party/quiche/src/quic/core/quic_packets_test.cc",
"third_party/quiche/src/quic/core/quic_received_packet_manager_test.cc", "third_party/quiche/src/quic/core/quic_received_packet_manager_test.cc",
"third_party/quiche/src/quic/core/quic_sent_packet_manager_test.cc", "third_party/quiche/src/quic/core/quic_sent_packet_manager_test.cc",
"third_party/quiche/src/quic/core/quic_server_id_test.cc", "third_party/quiche/src/quic/core/quic_server_id_test.cc",
...@@ -5683,7 +5685,6 @@ test("net_unittests") { ...@@ -5683,7 +5685,6 @@ test("net_unittests") {
"third_party/quiche/src/quic/core/http/quic_spdy_server_stream_base_test.cc", "third_party/quiche/src/quic/core/http/quic_spdy_server_stream_base_test.cc",
"third_party/quiche/src/quic/core/quic_epoll_alarm_factory_test.cc", "third_party/quiche/src/quic/core/quic_epoll_alarm_factory_test.cc",
"third_party/quiche/src/quic/core/quic_epoll_connection_helper_test.cc", "third_party/quiche/src/quic/core/quic_epoll_connection_helper_test.cc",
"third_party/quiche/src/quic/core/stateless_rejector_test.cc",
"third_party/quiche/src/quic/tools/quic_client_test.cc", "third_party/quiche/src/quic/tools/quic_client_test.cc",
"third_party/quiche/src/quic/tools/quic_memory_cache_backend_test.cc", "third_party/quiche/src/quic/tools/quic_memory_cache_backend_test.cc",
"third_party/quiche/src/quic/tools/quic_server_test.cc", "third_party/quiche/src/quic/tools/quic_server_test.cc",
......
...@@ -1559,7 +1559,7 @@ void QuicChromiumClientSession::OnCryptoHandshakeMessageSent( ...@@ -1559,7 +1559,7 @@ void QuicChromiumClientSession::OnCryptoHandshakeMessageSent(
void QuicChromiumClientSession::OnCryptoHandshakeMessageReceived( void QuicChromiumClientSession::OnCryptoHandshakeMessageReceived(
const quic::CryptoHandshakeMessage& message) { const quic::CryptoHandshakeMessage& message) {
logger_->OnCryptoHandshakeMessageReceived(message); logger_->OnCryptoHandshakeMessageReceived(message);
if (message.tag() == quic::kREJ || message.tag() == quic::kSREJ) { if (message.tag() == quic::kREJ) {
UMA_HISTOGRAM_CUSTOM_COUNTS("Net.QuicSession.RejectLength", UMA_HISTOGRAM_CUSTOM_COUNTS("Net.QuicSession.RejectLength",
message.GetSerialized().length(), 1000, 10000, message.GetSerialized().length(), 1000, 10000,
50); 50);
......
...@@ -80,24 +80,9 @@ class TestTransactionFactory : public HttpTransactionFactory { ...@@ -80,24 +80,9 @@ class TestTransactionFactory : public HttpTransactionFactory {
std::unique_ptr<HttpNetworkSession> session_; std::unique_ptr<HttpNetworkSession> session_;
}; };
struct TestParams {
explicit TestParams(bool use_stateless_rejects)
: use_stateless_rejects(use_stateless_rejects) {}
friend std::ostream& operator<<(std::ostream& os, const TestParams& p) {
os << "{ use_stateless_rejects: " << p.use_stateless_rejects << " }";
return os;
}
bool use_stateless_rejects;
};
std::vector<TestParams> GetTestParams() {
return std::vector<TestParams>{TestParams(true), TestParams(false)};
}
} // namespace } // namespace
class QuicEndToEndTest : public ::testing::TestWithParam<TestParams>, class QuicEndToEndTest : public ::testing::Test,
public WithScopedTaskEnvironment { public WithScopedTaskEnvironment {
protected: protected:
QuicEndToEndTest() QuicEndToEndTest()
...@@ -115,9 +100,6 @@ class QuicEndToEndTest : public ::testing::TestWithParam<TestParams>, ...@@ -115,9 +100,6 @@ class QuicEndToEndTest : public ::testing::TestWithParam<TestParams>,
net::MutableNetworkTrafficAnnotationTag(TRAFFIC_ANNOTATION_FOR_TESTS); net::MutableNetworkTrafficAnnotationTag(TRAFFIC_ANNOTATION_FOR_TESTS);
session_params_.enable_quic = true; session_params_.enable_quic = true;
if (GetParam().use_stateless_rejects) {
session_params_.quic_connection_options.push_back(quic::kSREJ);
}
session_context_.quic_random = nullptr; session_context_.quic_random = nullptr;
session_context_.host_resolver = &host_resolver_; session_context_.host_resolver = &host_resolver_;
...@@ -256,11 +238,7 @@ class QuicEndToEndTest : public ::testing::TestWithParam<TestParams>, ...@@ -256,11 +238,7 @@ class QuicEndToEndTest : public ::testing::TestWithParam<TestParams>,
bool strike_register_no_startup_period_; bool strike_register_no_startup_period_;
}; };
INSTANTIATE_TEST_SUITE_P(Tests, TEST_F(QuicEndToEndTest, LargeGetWithNoPacketLoss) {
QuicEndToEndTest,
::testing::ValuesIn(GetTestParams()));
TEST_P(QuicEndToEndTest, LargeGetWithNoPacketLoss) {
std::string response(10 * 1024, 'x'); std::string response(10 * 1024, 'x');
AddToCache(request_.url.PathForRequest(), 200, "OK", response); AddToCache(request_.url.PathForRequest(), 200, "OK", response);
...@@ -277,9 +255,9 @@ TEST_P(QuicEndToEndTest, LargeGetWithNoPacketLoss) { ...@@ -277,9 +255,9 @@ TEST_P(QuicEndToEndTest, LargeGetWithNoPacketLoss) {
// crbug.com/559173 // crbug.com/559173
#if defined(THREAD_SANITIZER) #if defined(THREAD_SANITIZER)
TEST_P(QuicEndToEndTest, DISABLED_LargePostWithNoPacketLoss) { TEST_F(QuicEndToEndTest, DISABLED_LargePostWithNoPacketLoss) {
#else #else
TEST_P(QuicEndToEndTest, LargePostWithNoPacketLoss) { TEST_F(QuicEndToEndTest, LargePostWithNoPacketLoss) {
#endif #endif
InitializePostRequest(1024 * 1024); InitializePostRequest(1024 * 1024);
...@@ -297,9 +275,9 @@ TEST_P(QuicEndToEndTest, LargePostWithNoPacketLoss) { ...@@ -297,9 +275,9 @@ TEST_P(QuicEndToEndTest, LargePostWithNoPacketLoss) {
// crbug.com/559173 // crbug.com/559173
#if defined(THREAD_SANITIZER) #if defined(THREAD_SANITIZER)
TEST_P(QuicEndToEndTest, DISABLED_LargePostWithPacketLoss) { TEST_F(QuicEndToEndTest, DISABLED_LargePostWithPacketLoss) {
#else #else
TEST_P(QuicEndToEndTest, LargePostWithPacketLoss) { TEST_F(QuicEndToEndTest, LargePostWithPacketLoss) {
#endif #endif
// FLAGS_fake_packet_loss_percentage = 30; // FLAGS_fake_packet_loss_percentage = 30;
InitializePostRequest(1024 * 1024); InitializePostRequest(1024 * 1024);
...@@ -319,9 +297,9 @@ TEST_P(QuicEndToEndTest, LargePostWithPacketLoss) { ...@@ -319,9 +297,9 @@ TEST_P(QuicEndToEndTest, LargePostWithPacketLoss) {
// crbug.com/536845 // crbug.com/536845
#if defined(THREAD_SANITIZER) #if defined(THREAD_SANITIZER)
TEST_P(QuicEndToEndTest, DISABLED_UberTest) { TEST_F(QuicEndToEndTest, DISABLED_UberTest) {
#else #else
TEST_P(QuicEndToEndTest, UberTest) { TEST_F(QuicEndToEndTest, UberTest) {
#endif #endif
// FLAGS_fake_packet_loss_percentage = 30; // FLAGS_fake_packet_loss_percentage = 30;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment