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

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

Issue 2053133002: Remove MessageLoop::current()->RunUntilIdle() in net. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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/quic_http_stream_test.cc ('k') | net/quic/quic_stream_factory_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 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 267
268 scoped_refptr<X509Certificate> cert( 268 scoped_refptr<X509Certificate> cert(
269 ImportCertFromFile(GetTestCertsDirectory(), "wildcard.pem")); 269 ImportCertFromFile(GetTestCertsDirectory(), "wildcard.pem"));
270 verify_details_.cert_verify_result.verified_cert = cert; 270 verify_details_.cert_verify_result.verified_cert = cert;
271 verify_details_.cert_verify_result.is_issued_by_known_root = true; 271 verify_details_.cert_verify_result.is_issued_by_known_root = true;
272 crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details_); 272 crypto_client_stream_factory_.AddProofVerifyDetails(&verify_details_);
273 } 273 }
274 274
275 void SetUp() override { 275 void SetUp() override {
276 NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests(); 276 NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests();
277 base::MessageLoop::current()->RunUntilIdle(); 277 base::RunLoop().RunUntilIdle();
278 } 278 }
279 279
280 void TearDown() override { 280 void TearDown() override {
281 NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests(); 281 NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests();
282 // Empty the current queue. 282 // Empty the current queue.
283 base::MessageLoop::current()->RunUntilIdle(); 283 base::RunLoop().RunUntilIdle();
284 PlatformTest::TearDown(); 284 PlatformTest::TearDown();
285 NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests(); 285 NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests();
286 base::MessageLoop::current()->RunUntilIdle(); 286 base::RunLoop().RunUntilIdle();
287 } 287 }
288 288
289 std::unique_ptr<QuicEncryptedPacket> ConstructClientConnectionClosePacket( 289 std::unique_ptr<QuicEncryptedPacket> ConstructClientConnectionClosePacket(
290 QuicPacketNumber num) { 290 QuicPacketNumber num) {
291 return client_maker_.MakeConnectionClosePacket(num); 291 return client_maker_.MakeConnectionClosePacket(num);
292 } 292 }
293 293
294 std::unique_ptr<QuicEncryptedPacket> ConstructServerConnectionClosePacket( 294 std::unique_ptr<QuicEncryptedPacket> ConstructServerConnectionClosePacket(
295 QuicPacketNumber num) { 295 QuicPacketNumber num) {
296 return server_maker_.MakeConnectionClosePacket(num); 296 return server_maker_.MakeConnectionClosePacket(num);
(...skipping 1858 matching lines...) Expand 10 before | Expand all | Expand 10 after
2155 cert_transparency_verifier_(new MultiLogCTVerifier()), 2155 cert_transparency_verifier_(new MultiLogCTVerifier()),
2156 ssl_config_service_(new SSLConfigServiceDefaults), 2156 ssl_config_service_(new SSLConfigServiceDefaults),
2157 proxy_service_(ProxyService::CreateDirect()), 2157 proxy_service_(ProxyService::CreateDirect()),
2158 auth_handler_factory_( 2158 auth_handler_factory_(
2159 HttpAuthHandlerFactory::CreateDefault(&host_resolver_)), 2159 HttpAuthHandlerFactory::CreateDefault(&host_resolver_)),
2160 random_generator_(0), 2160 random_generator_(0),
2161 ssl_data_(ASYNC, OK) {} 2161 ssl_data_(ASYNC, OK) {}
2162 2162
2163 void SetUp() override { 2163 void SetUp() override {
2164 NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests(); 2164 NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests();
2165 base::MessageLoop::current()->RunUntilIdle(); 2165 base::RunLoop().RunUntilIdle();
2166 2166
2167 HttpNetworkSession::Params params; 2167 HttpNetworkSession::Params params;
2168 2168
2169 clock_->AdvanceTime(QuicTime::Delta::FromMilliseconds(20)); 2169 clock_->AdvanceTime(QuicTime::Delta::FromMilliseconds(20));
2170 params.quic_clock = clock_; 2170 params.quic_clock = clock_;
2171 2171
2172 crypto_client_stream_factory_.set_handshake_mode( 2172 crypto_client_stream_factory_.set_handshake_mode(
2173 MockCryptoClientStream::CONFIRM_HANDSHAKE); 2173 MockCryptoClientStream::CONFIRM_HANDSHAKE);
2174 params.quic_crypto_client_stream_factory = &crypto_client_stream_factory_; 2174 params.quic_crypto_client_stream_factory = &crypto_client_stream_factory_;
2175 2175
(...skipping 18 matching lines...) Expand all
2194 2194
2195 session_.reset(new HttpNetworkSession(params)); 2195 session_.reset(new HttpNetworkSession(params));
2196 session_->quic_stream_factory()->set_require_confirmation(true); 2196 session_->quic_stream_factory()->set_require_confirmation(true);
2197 ASSERT_EQ(params.quic_socket_receive_buffer_size, 2197 ASSERT_EQ(params.quic_socket_receive_buffer_size,
2198 session_->quic_stream_factory()->socket_receive_buffer_size()); 2198 session_->quic_stream_factory()->socket_receive_buffer_size());
2199 } 2199 }
2200 2200
2201 void TearDown() override { 2201 void TearDown() override {
2202 NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests(); 2202 NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests();
2203 // Empty the current queue. 2203 // Empty the current queue.
2204 base::MessageLoop::current()->RunUntilIdle(); 2204 base::RunLoop().RunUntilIdle();
2205 PlatformTest::TearDown(); 2205 PlatformTest::TearDown();
2206 NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests(); 2206 NetworkChangeNotifier::NotifyObserversOfIPAddressChangeForTests();
2207 base::MessageLoop::current()->RunUntilIdle(); 2207 base::RunLoop().RunUntilIdle();
2208 } 2208 }
2209 2209
2210 void SetAlternativeService(const std::string& origin) { 2210 void SetAlternativeService(const std::string& origin) {
2211 HostPortPair destination; 2211 HostPortPair destination;
2212 switch (destination_type_) { 2212 switch (destination_type_) {
2213 case SAME_AS_FIRST: 2213 case SAME_AS_FIRST:
2214 destination = HostPortPair(origin1_, 443); 2214 destination = HostPortPair(origin1_, 443);
2215 break; 2215 break;
2216 case SAME_AS_SECOND: 2216 case SAME_AS_SECOND:
2217 destination = HostPortPair(origin2_, 443); 2217 destination = HostPortPair(origin2_, 443);
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
2557 AddHangingSocketData(); 2557 AddHangingSocketData();
2558 2558
2559 SendRequestAndExpectQuicResponse(origin1_); 2559 SendRequestAndExpectQuicResponse(origin1_);
2560 SendRequestAndExpectQuicResponse(origin2_); 2560 SendRequestAndExpectQuicResponse(origin2_);
2561 2561
2562 EXPECT_TRUE(AllDataConsumed()); 2562 EXPECT_TRUE(AllDataConsumed());
2563 } 2563 }
2564 2564
2565 } // namespace test 2565 } // namespace test
2566 } // namespace net 2566 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/quic_http_stream_test.cc ('k') | net/quic/quic_stream_factory_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698