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/url_request/url_request_http_job.h" | 5 #include "net/url_request/url_request_http_job.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include <cstddef> | 9 #include <cstddef> |
10 #include <memory> | 10 #include <memory> |
11 | 11 |
12 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
13 #include "base/memory/ptr_util.h" | 13 #include "base/memory/ptr_util.h" |
14 #include "base/memory/ref_counted.h" | 14 #include "base/memory/ref_counted.h" |
15 #include "base/run_loop.h" | 15 #include "base/run_loop.h" |
16 #include "base/strings/string_split.h" | 16 #include "base/strings/string_split.h" |
17 #include "net/base/auth.h" | 17 #include "net/base/auth.h" |
18 #include "net/base/request_priority.h" | 18 #include "net/base/request_priority.h" |
19 #include "net/base/sdch_observer.h" | 19 #include "net/base/sdch_observer.h" |
20 #include "net/cookies/cookie_store_test_helpers.h" | 20 #include "net/cookies/cookie_store_test_helpers.h" |
21 #include "net/http/http_transaction_factory.h" | 21 #include "net/http/http_transaction_factory.h" |
22 #include "net/http/http_transaction_test_util.h" | 22 #include "net/http/http_transaction_test_util.h" |
| 23 #include "net/log/net_log_event_type.h" |
23 #include "net/log/test_net_log.h" | 24 #include "net/log/test_net_log.h" |
24 #include "net/log/test_net_log_entry.h" | 25 #include "net/log/test_net_log_entry.h" |
25 #include "net/log/test_net_log_util.h" | 26 #include "net/log/test_net_log_util.h" |
26 #include "net/socket/socket_test_util.h" | 27 #include "net/socket/socket_test_util.h" |
27 #include "net/test/cert_test_util.h" | 28 #include "net/test/cert_test_util.h" |
28 #include "net/test/gtest_util.h" | 29 #include "net/test/gtest_util.h" |
29 #include "net/test/test_data_directory.h" | 30 #include "net/test/test_data_directory.h" |
30 #include "net/url_request/url_request.h" | 31 #include "net/url_request/url_request.h" |
31 #include "net/url_request/url_request_job_factory_impl.h" | 32 #include "net/url_request/url_request_job_factory_impl.h" |
32 #include "net/url_request/url_request_status.h" | 33 #include "net/url_request/url_request_status.h" |
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
482 | 483 |
483 net_log_.Clear(); | 484 net_log_.Clear(); |
484 r->Start(); | 485 r->Start(); |
485 base::RunLoop().Run(); | 486 base::RunLoop().Run(); |
486 | 487 |
487 if (test.upgrade_expected) { | 488 if (test.upgrade_expected) { |
488 net::TestNetLogEntry::List entries; | 489 net::TestNetLogEntry::List entries; |
489 net_log_.GetEntries(&entries); | 490 net_log_.GetEntries(&entries); |
490 int redirects = 0; | 491 int redirects = 0; |
491 for (const auto& entry : entries) { | 492 for (const auto& entry : entries) { |
492 if (entry.type == net::NetLog::TYPE_URL_REQUEST_REDIRECT_JOB) { | 493 if (entry.type == net::NetLogEventType::URL_REQUEST_REDIRECT_JOB) { |
493 redirects++; | 494 redirects++; |
494 std::string value; | 495 std::string value; |
495 EXPECT_TRUE(entry.GetStringValue("reason", &value)); | 496 EXPECT_TRUE(entry.GetStringValue("reason", &value)); |
496 EXPECT_EQ("HSTS", value); | 497 EXPECT_EQ("HSTS", value); |
497 } | 498 } |
498 } | 499 } |
499 EXPECT_EQ(1, redirects); | 500 EXPECT_EQ(1, redirects); |
500 EXPECT_EQ(1, d.received_redirect_count()); | 501 EXPECT_EQ(1, d.received_redirect_count()); |
501 EXPECT_EQ(2u, r->url_chain().size()); | 502 EXPECT_EQ(2u, r->url_chain().size()); |
502 } else { | 503 } else { |
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
818 base::RunLoop().RunUntilIdle(); | 819 base::RunLoop().RunUntilIdle(); |
819 EXPECT_EQ(URLRequestStatus::IO_PENDING, req_->status().status()); | 820 EXPECT_EQ(URLRequestStatus::IO_PENDING, req_->status().status()); |
820 EXPECT_TRUE(fake_handshake_stream->initialize_stream_was_called()); | 821 EXPECT_TRUE(fake_handshake_stream->initialize_stream_was_called()); |
821 } | 822 } |
822 | 823 |
823 #endif // defined(ENABLE_WEBSOCKETS) | 824 #endif // defined(ENABLE_WEBSOCKETS) |
824 | 825 |
825 } // namespace | 826 } // namespace |
826 | 827 |
827 } // namespace net | 828 } // namespace net |
OLD | NEW |