Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(234)

Side by Side Diff: net/quic/chromium/quic_network_transaction_unittest.cc

Issue 2295043004: Make QUIC tests restore flags to their default values (Closed)
Patch Set: remove the workaround Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/quic/chromium/quic_end_to_end_unittest.cc ('k') | net/quic/core/quic_protocol_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <memory> 5 #include <memory>
6 #include <ostream> 6 #include <ostream>
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 2492 matching lines...) Expand 10 before | Expand all | Expand 10 after
2503 EXPECT_LT(0u, entries.size()); 2503 EXPECT_LT(0u, entries.size());
2504 2504
2505 // Check that we logged a QUIC_HTTP_STREAM_ADOPTED_PUSH_STREAM 2505 // Check that we logged a QUIC_HTTP_STREAM_ADOPTED_PUSH_STREAM
2506 int pos = ExpectLogContainsSomewhere( 2506 int pos = ExpectLogContainsSomewhere(
2507 entries, 0, NetLog::TYPE_QUIC_HTTP_STREAM_ADOPTED_PUSH_STREAM, 2507 entries, 0, NetLog::TYPE_QUIC_HTTP_STREAM_ADOPTED_PUSH_STREAM,
2508 NetLog::PHASE_NONE); 2508 NetLog::PHASE_NONE);
2509 EXPECT_LT(0, pos); 2509 EXPECT_LT(0, pos);
2510 } 2510 }
2511 2511
2512 TEST_P(QuicNetworkTransactionTest, QuicForceHolBlocking) { 2512 TEST_P(QuicNetworkTransactionTest, QuicForceHolBlocking) {
2513 ValueRestore<bool> old_v35_flag(&FLAGS_quic_enable_version_35,
2514 FLAGS_quic_enable_version_35);
2515 ValueRestore<bool> old_v36_flag(&FLAGS_quic_enable_version_36,
2516 FLAGS_quic_enable_version_36);
2513 FLAGS_quic_enable_version_35 = true; 2517 FLAGS_quic_enable_version_35 = true;
2514 FLAGS_quic_enable_version_36 = true; 2518 FLAGS_quic_enable_version_36 = true;
2515 params_.quic_force_hol_blocking = true; 2519 params_.quic_force_hol_blocking = true;
2516 params_.origins_to_force_quic_on.insert( 2520 params_.origins_to_force_quic_on.insert(
2517 HostPortPair::FromString("mail.example.org:443")); 2521 HostPortPair::FromString("mail.example.org:443"));
2518 2522
2519 MockQuicData mock_quic_data; 2523 MockQuicData mock_quic_data;
2520 2524
2521 QuicStreamOffset offset = 0; 2525 QuicStreamOffset offset = 0;
2522 mock_quic_data.AddWrite(ConstructClientRequestHeadersPacket( 2526 mock_quic_data.AddWrite(ConstructClientRequestHeadersPacket(
(...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after
2974 AddHangingSocketData(); 2978 AddHangingSocketData();
2975 2979
2976 SendRequestAndExpectQuicResponse(origin1_); 2980 SendRequestAndExpectQuicResponse(origin1_);
2977 SendRequestAndExpectQuicResponse(origin2_); 2981 SendRequestAndExpectQuicResponse(origin2_);
2978 2982
2979 EXPECT_TRUE(AllDataConsumed()); 2983 EXPECT_TRUE(AllDataConsumed());
2980 } 2984 }
2981 2985
2982 } // namespace test 2986 } // namespace test
2983 } // namespace net 2987 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/chromium/quic_end_to_end_unittest.cc ('k') | net/quic/core/quic_protocol_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698