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

Side by Side Diff: net/http/http_network_transaction_unittest.cc

Issue 723343002: Update from https://crrev.com/304121 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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_network_transaction.h" 5 #include "net/http/http_network_transaction.h"
6 6
7 #include <math.h> // ceil 7 #include <math.h> // ceil
8 #include <stdarg.h> 8 #include <stdarg.h>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 // Original socket limits. Some tests set these. Safest to always restore 401 // Original socket limits. Some tests set these. Safest to always restore
402 // them once each test has been run. 402 // them once each test has been run.
403 int old_max_group_sockets_; 403 int old_max_group_sockets_;
404 int old_max_pool_sockets_; 404 int old_max_pool_sockets_;
405 }; 405 };
406 406
407 INSTANTIATE_TEST_CASE_P( 407 INSTANTIATE_TEST_CASE_P(
408 NextProto, 408 NextProto,
409 HttpNetworkTransactionTest, 409 HttpNetworkTransactionTest,
410 testing::Values(kProtoDeprecatedSPDY2, 410 testing::Values(kProtoDeprecatedSPDY2,
411 kProtoSPDY3, kProtoSPDY31, kProtoSPDY4)); 411 kProtoSPDY3, kProtoSPDY31, kProtoSPDY4_14, kProtoSPDY4_15));
412 412
413 namespace { 413 namespace {
414 414
415 class BeforeNetworkStartHandler { 415 class BeforeNetworkStartHandler {
416 public: 416 public:
417 explicit BeforeNetworkStartHandler(bool defer) 417 explicit BeforeNetworkStartHandler(bool defer)
418 : defer_on_before_network_start_(defer), 418 : defer_on_before_network_start_(defer),
419 observed_before_network_start_(false) {} 419 observed_before_network_start_(false) {}
420 420
421 void OnBeforeNetworkStart(bool* defer) { 421 void OnBeforeNetworkStart(bool* defer) {
(...skipping 12759 matching lines...) Expand 10 before | Expand all | Expand 10 after
13181 EXPECT_EQ(ERR_IO_PENDING, rv); 13181 EXPECT_EQ(ERR_IO_PENDING, rv);
13182 13182
13183 rv = callback.WaitForResult(); 13183 rv = callback.WaitForResult();
13184 EXPECT_EQ(ERR_CONNECTION_RESET, rv); 13184 EXPECT_EQ(ERR_CONNECTION_RESET, rv);
13185 13185
13186 const HttpResponseInfo* response = trans->GetResponseInfo(); 13186 const HttpResponseInfo* response = trans->GetResponseInfo();
13187 EXPECT_TRUE(response == NULL); 13187 EXPECT_TRUE(response == NULL);
13188 } 13188 }
13189 13189
13190 } // namespace net 13190 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_network_transaction.cc ('k') | net/http/http_proxy_client_socket_pool_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698