Chromium Code Reviews| Index: chrome/browser/extensions/api/sockets_tcp/sockets_tcp_apitest.cc |
| diff --git a/chrome/browser/extensions/api/sockets_tcp/sockets_tcp_apitest.cc b/chrome/browser/extensions/api/sockets_tcp/sockets_tcp_apitest.cc |
| index 276c1e6171119ff354008c678566dd8b55ccfbdb..02955495970f9f9b033e58f20cf79bc57c1271b1 100644 |
| --- a/chrome/browser/extensions/api/sockets_tcp/sockets_tcp_apitest.cc |
| +++ b/chrome/browser/extensions/api/sockets_tcp/sockets_tcp_apitest.cc |
| @@ -83,19 +83,32 @@ IN_PROC_BROWSER_TEST_F(SocketsTcpApiTest, SocketsTcpCreateGood) { |
| } |
| IN_PROC_BROWSER_TEST_F(SocketsTcpApiTest, SocketTcpExtension) { |
|
Ryan Sleevi
2014/02/04 22:28:14
Rather than modifying the existing test, you shoul
lally
2014/02/11 22:05:35
Done.
|
| - scoped_ptr<net::SpawnedTestServer> test_server( |
| + scoped_ptr<net::SpawnedTestServer> test_tcp_server( |
| new net::SpawnedTestServer( |
| net::SpawnedTestServer::TYPE_TCP_ECHO, |
| net::SpawnedTestServer::kLocalhost, |
| base::FilePath(FILE_PATH_LITERAL("net/data")))); |
| - EXPECT_TRUE(test_server->Start()); |
| + scoped_ptr<net::SpawnedTestServer> test_https_server( |
| + new net::SpawnedTestServer( |
| + net::SpawnedTestServer::TYPE_HTTPS, |
| + net::BaseTestServer::SSLOptions(), |
| + base::FilePath(FILE_PATH_LITERAL("net/data")))); |
| + // Start them in parallel. |
| + EXPECT_TRUE(test_tcp_server->StartInBackground()); |
| + EXPECT_TRUE(test_https_server->StartInBackground()); |
| + EXPECT_TRUE(test_tcp_server->BlockUntilStarted()); |
| + EXPECT_TRUE(test_https_server->BlockUntilStarted()); |
| - net::HostPortPair host_port_pair = test_server->host_port_pair(); |
| - int port = host_port_pair.port(); |
| - ASSERT_TRUE(port > 0); |
| + net::HostPortPair tcp_host_port_pair = test_tcp_server->host_port_pair(); |
| + int tcp_port = tcp_host_port_pair.port(); |
| + ASSERT_TRUE(tcp_port > 0); |
| + |
| + net::HostPortPair https_host_port_pair = test_https_server->host_port_pair(); |
| + int https_port = https_host_port_pair.port(); |
| + ASSERT_TRUE(https_port > 0); |
| // Test that connect() is properly resolving hostnames. |
| - host_port_pair.set_host("lOcAlHoSt"); |
| + tcp_host_port_pair.set_host("lOcAlHoSt"); |
| ResultCatcher catcher; |
| catcher.RestrictToProfile(browser()->profile()); |
| @@ -105,7 +118,9 @@ IN_PROC_BROWSER_TEST_F(SocketsTcpApiTest, SocketTcpExtension) { |
| ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("sockets_tcp/api"))); |
| EXPECT_TRUE(listener.WaitUntilSatisfied()); |
| listener.Reply( |
| - base::StringPrintf("tcp:%s:%d", host_port_pair.host().c_str(), port)); |
| + base::StringPrintf("tcp:%s:%d,https:%s:%d", |
| + tcp_host_port_pair.host().c_str(), tcp_port, |
| + https_host_port_pair.host().c_str(), https_port)); |
| EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
| } |