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

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

Issue 13145003: Rewrite std::string("") to std::string(), Linux edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ugh Created 7 years, 8 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 | Annotate | Revision Log
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 "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 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 HostResolver* host_resolver, 454 HostResolver* host_resolver,
455 CertVerifier* /* cert_verifier */) 455 CertVerifier* /* cert_verifier */)
456 : ParentPool(0, 0, NULL, host_resolver, NULL, NULL) {} 456 : ParentPool(0, 0, NULL, host_resolver, NULL, NULL) {}
457 457
458 template<> 458 template<>
459 CaptureGroupNameHttpProxySocketPool::CaptureGroupNameSocketPool( 459 CaptureGroupNameHttpProxySocketPool::CaptureGroupNameSocketPool(
460 HostResolver* host_resolver, 460 HostResolver* host_resolver,
461 CertVerifier* /* cert_verifier */) 461 CertVerifier* /* cert_verifier */)
462 : HttpProxyClientSocketPool(0, 0, NULL, host_resolver, NULL, NULL, NULL) {} 462 : HttpProxyClientSocketPool(0, 0, NULL, host_resolver, NULL, NULL, NULL) {}
463 463
464 template<> 464 template <>
465 CaptureGroupNameSSLSocketPool::CaptureGroupNameSocketPool( 465 CaptureGroupNameSSLSocketPool::CaptureGroupNameSocketPool(
466 HostResolver* host_resolver, 466 HostResolver* host_resolver,
467 CertVerifier* cert_verifier) 467 CertVerifier* cert_verifier)
468 : SSLClientSocketPool(0, 0, NULL, host_resolver, cert_verifier, NULL, 468 : SSLClientSocketPool(0,
469 NULL, "", NULL, NULL, NULL, NULL, NULL, NULL) {} 469 0,
470 NULL,
471 host_resolver,
472 cert_verifier,
473 NULL,
474 NULL,
475 std::string(),
476 NULL,
477 NULL,
478 NULL,
479 NULL,
480 NULL,
481 NULL) {}
470 482
471 //----------------------------------------------------------------------------- 483 //-----------------------------------------------------------------------------
472 484
473 // This is the expected return from a current server advertising SPDY. 485 // This is the expected return from a current server advertising SPDY.
474 static const char kAlternateProtocolHttpHeader[] = 486 static const char kAlternateProtocolHttpHeader[] =
475 "Alternate-Protocol: 443:npn-spdy/2\r\n\r\n"; 487 "Alternate-Protocol: 443:npn-spdy/2\r\n\r\n";
476 488
477 // Helper functions for validating that AuthChallengeInfo's are correctly 489 // Helper functions for validating that AuthChallengeInfo's are correctly
478 // configured for common cases. 490 // configured for common cases.
479 bool CheckBasicServerAuth(const AuthChallengeInfo* auth_challenge) { 491 bool CheckBasicServerAuth(const AuthChallengeInfo* auth_challenge) {
(...skipping 8364 matching lines...) Expand 10 before | Expand all | Expand 10 after
8844 HttpNetworkSession::NORMAL_SOCKET_POOL), 8856 HttpNetworkSession::NORMAL_SOCKET_POOL),
8845 BoundNetLog())); 8857 BoundNetLog()));
8846 EXPECT_EQ(OK, callback.WaitForResult()); 8858 EXPECT_EQ(OK, callback.WaitForResult());
8847 8859
8848 SSLConfig ssl_config; 8860 SSLConfig ssl_config;
8849 session->ssl_config_service()->GetSSLConfig(&ssl_config); 8861 session->ssl_config_service()->GetSSLConfig(&ssl_config);
8850 scoped_ptr<ClientSocketHandle> ssl_connection(new ClientSocketHandle); 8862 scoped_ptr<ClientSocketHandle> ssl_connection(new ClientSocketHandle);
8851 SSLClientSocketContext context; 8863 SSLClientSocketContext context;
8852 context.cert_verifier = session_deps.cert_verifier.get(); 8864 context.cert_verifier = session_deps.cert_verifier.get();
8853 ssl_connection->set_socket(session_deps.socket_factory->CreateSSLClientSocket( 8865 ssl_connection->set_socket(session_deps.socket_factory->CreateSSLClientSocket(
8854 connection.release(), HostPortPair("" , 443), ssl_config, context)); 8866 connection.release(),
8867 HostPortPair(std::string(), 443),
8868 ssl_config,
8869 context));
8855 EXPECT_EQ(ERR_IO_PENDING, 8870 EXPECT_EQ(ERR_IO_PENDING,
8856 ssl_connection->socket()->Connect(callback.callback())); 8871 ssl_connection->socket()->Connect(callback.callback()));
8857 EXPECT_EQ(OK, callback.WaitForResult()); 8872 EXPECT_EQ(OK, callback.WaitForResult());
8858 8873
8859 EXPECT_EQ(OK, spdy_session->InitializeWithSocket(ssl_connection.release(), 8874 EXPECT_EQ(OK, spdy_session->InitializeWithSocket(ssl_connection.release(),
8860 true, OK)); 8875 true, OK));
8861 8876
8862 trans.reset(new HttpNetworkTransaction(DEFAULT_PRIORITY, session)); 8877 trans.reset(new HttpNetworkTransaction(DEFAULT_PRIORITY, session));
8863 8878
8864 rv = trans->Start(&request, callback.callback(), BoundNetLog()); 8879 rv = trans->Start(&request, callback.callback(), BoundNetLog());
(...skipping 2411 matching lines...) Expand 10 before | Expand all | Expand 10 after
11276 trans2.Start(&request2, callback2.callback(), BoundNetLog())); 11291 trans2.Start(&request2, callback2.callback(), BoundNetLog()));
11277 MessageLoop::current()->RunUntilIdle(); 11292 MessageLoop::current()->RunUntilIdle();
11278 data2->RunFor(3); 11293 data2->RunFor(3);
11279 11294
11280 ASSERT_TRUE(callback2.have_result()); 11295 ASSERT_TRUE(callback2.have_result());
11281 EXPECT_EQ(OK, callback2.WaitForResult()); 11296 EXPECT_EQ(OK, callback2.WaitForResult());
11282 EXPECT_TRUE(trans2.GetResponseInfo()->was_fetched_via_spdy); 11297 EXPECT_TRUE(trans2.GetResponseInfo()->was_fetched_via_spdy);
11283 } 11298 }
11284 11299
11285 } // namespace net 11300 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_network_transaction.cc ('k') | net/http/http_network_transaction_spdy3_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698