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

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

Issue 1809863002: Update some callers to use more direct ways of constructing IPAddress from well known literals. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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/base/ip_address_unittest.cc ('k') | net/http/http_server_properties_impl_unittest.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 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 <stdint.h> 9 #include <stdint.h>
10 #include <limits> 10 #include <limits>
(...skipping 12894 matching lines...) Expand 10 before | Expand all | Expand 10 after
12905 scoped_ptr<SpdyFrame> host2_resp_body( 12905 scoped_ptr<SpdyFrame> host2_resp_body(
12906 spdy_util_.ConstructSpdyBodyFrame(3, true)); 12906 spdy_util_.ConstructSpdyBodyFrame(3, true));
12907 MockRead spdy_reads[] = { 12907 MockRead spdy_reads[] = {
12908 CreateMockRead(*host1_resp, 1), 12908 CreateMockRead(*host1_resp, 1),
12909 CreateMockRead(*host1_resp_body, 2), 12909 CreateMockRead(*host1_resp_body, 2),
12910 CreateMockRead(*host2_resp, 4), 12910 CreateMockRead(*host2_resp, 4),
12911 CreateMockRead(*host2_resp_body, 5), 12911 CreateMockRead(*host2_resp_body, 5),
12912 MockRead(ASYNC, 0, 6), 12912 MockRead(ASYNC, 0, 6),
12913 }; 12913 };
12914 12914
12915 IPAddress ip; 12915 auto peer_addr = IPEndPoint(IPAddress::IPv4Localhost(), 443);
Ryan Hamilton 2016/03/17 00:28:37 How about: IPEndPoint peer_addr(IPAddress::IPv4Lo
eroman 2016/03/17 01:01:19 Done.
12916 ASSERT_TRUE(ip.AssignFromIPLiteral("127.0.0.1"));
12917 IPEndPoint peer_addr = IPEndPoint(ip, 443);
12918 MockConnect connect(ASYNC, OK, peer_addr); 12916 MockConnect connect(ASYNC, OK, peer_addr);
12919 SequencedSocketData spdy_data(connect, spdy_reads, arraysize(spdy_reads), 12917 SequencedSocketData spdy_data(connect, spdy_reads, arraysize(spdy_reads),
12920 spdy_writes, arraysize(spdy_writes)); 12918 spdy_writes, arraysize(spdy_writes));
12921 session_deps_.socket_factory->AddSocketDataProvider(&spdy_data); 12919 session_deps_.socket_factory->AddSocketDataProvider(&spdy_data);
12922 12920
12923 TestCompletionCallback callback; 12921 TestCompletionCallback callback;
12924 HttpRequestInfo request1; 12922 HttpRequestInfo request1;
12925 request1.method = "GET"; 12923 request1.method = "GET";
12926 request1.url = GURL("https://www.example.org/"); 12924 request1.url = GURL("https://www.example.org/");
12927 request1.load_flags = 0; 12925 request1.load_flags = 0;
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
13005 scoped_ptr<SpdyFrame> host2_resp_body( 13003 scoped_ptr<SpdyFrame> host2_resp_body(
13006 spdy_util_.ConstructSpdyBodyFrame(3, true)); 13004 spdy_util_.ConstructSpdyBodyFrame(3, true));
13007 MockRead spdy_reads[] = { 13005 MockRead spdy_reads[] = {
13008 CreateMockRead(*host1_resp, 1), 13006 CreateMockRead(*host1_resp, 1),
13009 CreateMockRead(*host1_resp_body, 2), 13007 CreateMockRead(*host1_resp_body, 2),
13010 CreateMockRead(*host2_resp, 4), 13008 CreateMockRead(*host2_resp, 4),
13011 CreateMockRead(*host2_resp_body, 5), 13009 CreateMockRead(*host2_resp_body, 5),
13012 MockRead(ASYNC, 0, 6), 13010 MockRead(ASYNC, 0, 6),
13013 }; 13011 };
13014 13012
13015 IPAddress ip; 13013 auto peer_addr = IPEndPoint(IPAddress::IPv4Localhost(), 443);
13016 ASSERT_TRUE(ip.AssignFromIPLiteral("127.0.0.1"));
13017 IPEndPoint peer_addr = IPEndPoint(ip, 443);
13018 MockConnect connect(ASYNC, OK, peer_addr); 13014 MockConnect connect(ASYNC, OK, peer_addr);
13019 SequencedSocketData spdy_data(connect, spdy_reads, arraysize(spdy_reads), 13015 SequencedSocketData spdy_data(connect, spdy_reads, arraysize(spdy_reads),
13020 spdy_writes, arraysize(spdy_writes)); 13016 spdy_writes, arraysize(spdy_writes));
13021 session_deps_.socket_factory->AddSocketDataProvider(&spdy_data); 13017 session_deps_.socket_factory->AddSocketDataProvider(&spdy_data);
13022 13018
13023 TestCompletionCallback callback; 13019 TestCompletionCallback callback;
13024 HttpRequestInfo request1; 13020 HttpRequestInfo request1;
13025 request1.method = "GET"; 13021 request1.method = "GET";
13026 request1.url = GURL("https://www.example.org/"); 13022 request1.url = GURL("https://www.example.org/");
13027 request1.load_flags = 0; 13023 request1.load_flags = 0;
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
13136 scoped_ptr<SpdyFrame> host2_resp_body( 13132 scoped_ptr<SpdyFrame> host2_resp_body(
13137 spdy_util_.ConstructSpdyBodyFrame(3, true)); 13133 spdy_util_.ConstructSpdyBodyFrame(3, true));
13138 MockRead spdy_reads[] = { 13134 MockRead spdy_reads[] = {
13139 CreateMockRead(*host1_resp, 1), 13135 CreateMockRead(*host1_resp, 1),
13140 CreateMockRead(*host1_resp_body, 2), 13136 CreateMockRead(*host1_resp_body, 2),
13141 CreateMockRead(*host2_resp, 4), 13137 CreateMockRead(*host2_resp, 4),
13142 CreateMockRead(*host2_resp_body, 5), 13138 CreateMockRead(*host2_resp_body, 5),
13143 MockRead(ASYNC, 0, 6), 13139 MockRead(ASYNC, 0, 6),
13144 }; 13140 };
13145 13141
13146 IPAddress ip; 13142 auto peer_addr = IPEndPoint(IPAddress::IPv4Localhost(), 443);
13147 ASSERT_TRUE(ip.AssignFromIPLiteral("127.0.0.1"));
13148 IPEndPoint peer_addr = IPEndPoint(ip, 443);
13149 MockConnect connect(ASYNC, OK, peer_addr); 13143 MockConnect connect(ASYNC, OK, peer_addr);
13150 SequencedSocketData spdy_data(connect, spdy_reads, arraysize(spdy_reads), 13144 SequencedSocketData spdy_data(connect, spdy_reads, arraysize(spdy_reads),
13151 spdy_writes, arraysize(spdy_writes)); 13145 spdy_writes, arraysize(spdy_writes));
13152 session_deps_.socket_factory->AddSocketDataProvider(&spdy_data); 13146 session_deps_.socket_factory->AddSocketDataProvider(&spdy_data);
13153 13147
13154 TestCompletionCallback callback; 13148 TestCompletionCallback callback;
13155 HttpRequestInfo request1; 13149 HttpRequestInfo request1;
13156 request1.method = "GET"; 13150 request1.method = "GET";
13157 request1.url = GURL("https://www.example.org/"); 13151 request1.url = GURL("https://www.example.org/");
13158 request1.load_flags = 0; 13152 request1.load_flags = 0;
(...skipping 2800 matching lines...) Expand 10 before | Expand all | Expand 10 after
15959 base::MessageLoop::current()->RunUntilIdle(); 15953 base::MessageLoop::current()->RunUntilIdle();
15960 15954
15961 EXPECT_TRUE(trans.GetResponseInfo()->was_fetched_via_spdy); 15955 EXPECT_TRUE(trans.GetResponseInfo()->was_fetched_via_spdy);
15962 HttpRequestHeaders headers; 15956 HttpRequestHeaders headers;
15963 ASSERT_TRUE(trans.GetFullRequestHeaders(&headers)); 15957 ASSERT_TRUE(trans.GetFullRequestHeaders(&headers));
15964 EXPECT_TRUE(headers.HasHeader(HttpRequestHeaders::kTokenBinding)); 15958 EXPECT_TRUE(headers.HasHeader(HttpRequestHeaders::kTokenBinding));
15965 } 15959 }
15966 #endif // !defined(OS_IOS) 15960 #endif // !defined(OS_IOS)
15967 15961
15968 } // namespace net 15962 } // namespace net
OLDNEW
« no previous file with comments | « net/base/ip_address_unittest.cc ('k') | net/http/http_server_properties_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698