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

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

Issue 657013003: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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/dns/mdns_client.cc ('k') | net/http/http_proxy_client_socket_pool.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 <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 7598 matching lines...) Expand 10 before | Expand all | Expand 10 after
7609 7609
7610 HttpNetworkSessionPeer peer(session); 7610 HttpNetworkSessionPeer peer(session);
7611 CaptureGroupNameTransportSocketPool* transport_conn_pool = 7611 CaptureGroupNameTransportSocketPool* transport_conn_pool =
7612 new CaptureGroupNameTransportSocketPool(NULL, NULL); 7612 new CaptureGroupNameTransportSocketPool(NULL, NULL);
7613 CaptureGroupNameSSLSocketPool* ssl_conn_pool = 7613 CaptureGroupNameSSLSocketPool* ssl_conn_pool =
7614 new CaptureGroupNameSSLSocketPool(NULL, NULL); 7614 new CaptureGroupNameSSLSocketPool(NULL, NULL);
7615 scoped_ptr<MockClientSocketPoolManager> mock_pool_manager( 7615 scoped_ptr<MockClientSocketPoolManager> mock_pool_manager(
7616 new MockClientSocketPoolManager); 7616 new MockClientSocketPoolManager);
7617 mock_pool_manager->SetTransportSocketPool(transport_conn_pool); 7617 mock_pool_manager->SetTransportSocketPool(transport_conn_pool);
7618 mock_pool_manager->SetSSLSocketPool(ssl_conn_pool); 7618 mock_pool_manager->SetSSLSocketPool(ssl_conn_pool);
7619 peer.SetClientSocketPoolManager( 7619 peer.SetClientSocketPoolManager(mock_pool_manager.Pass());
7620 mock_pool_manager.PassAs<ClientSocketPoolManager>());
7621 7620
7622 EXPECT_EQ(ERR_IO_PENDING, 7621 EXPECT_EQ(ERR_IO_PENDING,
7623 GroupNameTransactionHelper(tests[i].url, session)); 7622 GroupNameTransactionHelper(tests[i].url, session));
7624 if (tests[i].ssl) 7623 if (tests[i].ssl)
7625 EXPECT_EQ(tests[i].expected_group_name, 7624 EXPECT_EQ(tests[i].expected_group_name,
7626 ssl_conn_pool->last_group_name_received()); 7625 ssl_conn_pool->last_group_name_received());
7627 else 7626 else
7628 EXPECT_EQ(tests[i].expected_group_name, 7627 EXPECT_EQ(tests[i].expected_group_name,
7629 transport_conn_pool->last_group_name_received()); 7628 transport_conn_pool->last_group_name_received());
7630 } 7629 }
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
7676 HostPortPair proxy_host("http_proxy", 80); 7675 HostPortPair proxy_host("http_proxy", 80);
7677 CaptureGroupNameHttpProxySocketPool* http_proxy_pool = 7676 CaptureGroupNameHttpProxySocketPool* http_proxy_pool =
7678 new CaptureGroupNameHttpProxySocketPool(NULL, NULL); 7677 new CaptureGroupNameHttpProxySocketPool(NULL, NULL);
7679 CaptureGroupNameSSLSocketPool* ssl_conn_pool = 7678 CaptureGroupNameSSLSocketPool* ssl_conn_pool =
7680 new CaptureGroupNameSSLSocketPool(NULL, NULL); 7679 new CaptureGroupNameSSLSocketPool(NULL, NULL);
7681 7680
7682 scoped_ptr<MockClientSocketPoolManager> mock_pool_manager( 7681 scoped_ptr<MockClientSocketPoolManager> mock_pool_manager(
7683 new MockClientSocketPoolManager); 7682 new MockClientSocketPoolManager);
7684 mock_pool_manager->SetSocketPoolForHTTPProxy(proxy_host, http_proxy_pool); 7683 mock_pool_manager->SetSocketPoolForHTTPProxy(proxy_host, http_proxy_pool);
7685 mock_pool_manager->SetSocketPoolForSSLWithProxy(proxy_host, ssl_conn_pool); 7684 mock_pool_manager->SetSocketPoolForSSLWithProxy(proxy_host, ssl_conn_pool);
7686 peer.SetClientSocketPoolManager( 7685 peer.SetClientSocketPoolManager(mock_pool_manager.Pass());
7687 mock_pool_manager.PassAs<ClientSocketPoolManager>());
7688 7686
7689 EXPECT_EQ(ERR_IO_PENDING, 7687 EXPECT_EQ(ERR_IO_PENDING,
7690 GroupNameTransactionHelper(tests[i].url, session)); 7688 GroupNameTransactionHelper(tests[i].url, session));
7691 if (tests[i].ssl) 7689 if (tests[i].ssl)
7692 EXPECT_EQ(tests[i].expected_group_name, 7690 EXPECT_EQ(tests[i].expected_group_name,
7693 ssl_conn_pool->last_group_name_received()); 7691 ssl_conn_pool->last_group_name_received());
7694 else 7692 else
7695 EXPECT_EQ(tests[i].expected_group_name, 7693 EXPECT_EQ(tests[i].expected_group_name,
7696 http_proxy_pool->last_group_name_received()); 7694 http_proxy_pool->last_group_name_received());
7697 } 7695 }
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
7747 HostPortPair proxy_host("socks_proxy", 1080); 7745 HostPortPair proxy_host("socks_proxy", 1080);
7748 CaptureGroupNameSOCKSSocketPool* socks_conn_pool = 7746 CaptureGroupNameSOCKSSocketPool* socks_conn_pool =
7749 new CaptureGroupNameSOCKSSocketPool(NULL, NULL); 7747 new CaptureGroupNameSOCKSSocketPool(NULL, NULL);
7750 CaptureGroupNameSSLSocketPool* ssl_conn_pool = 7748 CaptureGroupNameSSLSocketPool* ssl_conn_pool =
7751 new CaptureGroupNameSSLSocketPool(NULL, NULL); 7749 new CaptureGroupNameSSLSocketPool(NULL, NULL);
7752 7750
7753 scoped_ptr<MockClientSocketPoolManager> mock_pool_manager( 7751 scoped_ptr<MockClientSocketPoolManager> mock_pool_manager(
7754 new MockClientSocketPoolManager); 7752 new MockClientSocketPoolManager);
7755 mock_pool_manager->SetSocketPoolForSOCKSProxy(proxy_host, socks_conn_pool); 7753 mock_pool_manager->SetSocketPoolForSOCKSProxy(proxy_host, socks_conn_pool);
7756 mock_pool_manager->SetSocketPoolForSSLWithProxy(proxy_host, ssl_conn_pool); 7754 mock_pool_manager->SetSocketPoolForSSLWithProxy(proxy_host, ssl_conn_pool);
7757 peer.SetClientSocketPoolManager( 7755 peer.SetClientSocketPoolManager(mock_pool_manager.Pass());
7758 mock_pool_manager.PassAs<ClientSocketPoolManager>());
7759 7756
7760 scoped_ptr<HttpTransaction> trans( 7757 scoped_ptr<HttpTransaction> trans(
7761 new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); 7758 new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
7762 7759
7763 EXPECT_EQ(ERR_IO_PENDING, 7760 EXPECT_EQ(ERR_IO_PENDING,
7764 GroupNameTransactionHelper(tests[i].url, session)); 7761 GroupNameTransactionHelper(tests[i].url, session));
7765 if (tests[i].ssl) 7762 if (tests[i].ssl)
7766 EXPECT_EQ(tests[i].expected_group_name, 7763 EXPECT_EQ(tests[i].expected_group_name,
7767 ssl_conn_pool->last_group_name_received()); 7764 ssl_conn_pool->last_group_name_received());
7768 else 7765 else
(...skipping 2032 matching lines...) Expand 10 before | Expand all | Expand 10 after
9801 TransportClientSocketPool* transport_pool = new TransportClientSocketPool( 9798 TransportClientSocketPool* transport_pool = new TransportClientSocketPool(
9802 50, // Max sockets for pool 9799 50, // Max sockets for pool
9803 1, // Max sockets per group 9800 1, // Max sockets per group
9804 &transport_pool_histograms, 9801 &transport_pool_histograms,
9805 session_deps_.host_resolver.get(), 9802 session_deps_.host_resolver.get(),
9806 session_deps_.socket_factory.get(), 9803 session_deps_.socket_factory.get(),
9807 session_deps_.net_log); 9804 session_deps_.net_log);
9808 scoped_ptr<MockClientSocketPoolManager> mock_pool_manager( 9805 scoped_ptr<MockClientSocketPoolManager> mock_pool_manager(
9809 new MockClientSocketPoolManager); 9806 new MockClientSocketPoolManager);
9810 mock_pool_manager->SetTransportSocketPool(transport_pool); 9807 mock_pool_manager->SetTransportSocketPool(transport_pool);
9811 session_peer.SetClientSocketPoolManager( 9808 session_peer.SetClientSocketPoolManager(mock_pool_manager.Pass());
9812 mock_pool_manager.PassAs<ClientSocketPoolManager>());
9813 9809
9814 scoped_ptr<HttpTransaction> trans( 9810 scoped_ptr<HttpTransaction> trans(
9815 new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); 9811 new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
9816 TestCompletionCallback callback; 9812 TestCompletionCallback callback;
9817 9813
9818 const MockWrite kGet( 9814 const MockWrite kGet(
9819 "GET / HTTP/1.1\r\n" 9815 "GET / HTTP/1.1\r\n"
9820 "Host: www.example.com\r\n" 9816 "Host: www.example.com\r\n"
9821 "Connection: keep-alive\r\n\r\n"); 9817 "Connection: keep-alive\r\n\r\n");
9822 const MockWrite kGetAuth( 9818 const MockWrite kGetAuth(
(...skipping 3383 matching lines...) Expand 10 before | Expand all | Expand 10 after
13206 EXPECT_EQ(ERR_IO_PENDING, rv); 13202 EXPECT_EQ(ERR_IO_PENDING, rv);
13207 13203
13208 rv = callback.WaitForResult(); 13204 rv = callback.WaitForResult();
13209 EXPECT_EQ(ERR_CONNECTION_RESET, rv); 13205 EXPECT_EQ(ERR_CONNECTION_RESET, rv);
13210 13206
13211 const HttpResponseInfo* response = trans->GetResponseInfo(); 13207 const HttpResponseInfo* response = trans->GetResponseInfo();
13212 EXPECT_TRUE(response == NULL); 13208 EXPECT_TRUE(response == NULL);
13213 } 13209 }
13214 13210
13215 } // namespace net 13211 } // namespace net
OLDNEW
« no previous file with comments | « net/dns/mdns_client.cc ('k') | net/http/http_proxy_client_socket_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698