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

Unified Diff: chrome/browser/extensions/api/sockets_tcp/sockets_tcp_apitest.cc

Issue 76403004: An implementation of chrome.socket.secure(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed, @rsleevi's comments, added a new TLS test, further separated TLS and TCP tests, and reba… Created 6 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 side-by-side diff with in-line comments
Download patch
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 60546e40343061a512a6f805b83b33515f37d505..d62ccaa66fe5a145962dbf63c3a501c1b7ab32c4 100644
--- a/chrome/browser/extensions/api/sockets_tcp/sockets_tcp_apitest.cc
+++ b/chrome/browser/extensions/api/sockets_tcp/sockets_tcp_apitest.cc
@@ -89,7 +89,10 @@ IN_PROC_BROWSER_TEST_F(SocketsTcpApiTest, SocketTcpExtension) {
net::SpawnedTestServer::TYPE_TCP_ECHO,
net::SpawnedTestServer::kLocalhost,
base::FilePath(FILE_PATH_LITERAL("net/data"))));
- EXPECT_TRUE(test_server->Start());
+
+ // Start them in parallel.
+ EXPECT_TRUE(test_server->StartInBackground());
+ EXPECT_TRUE(test_server->BlockUntilStarted());
net::HostPortPair host_port_pair = test_server->host_port_pair();
int port = host_port_pair.port();
@@ -110,3 +113,31 @@ IN_PROC_BROWSER_TEST_F(SocketsTcpApiTest, SocketTcpExtension) {
EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
}
+
+IN_PROC_BROWSER_TEST_F(SocketsTcpApiTest, SocketTcpExtensionTLS) {
+ 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 the servers in parallel.
Ryan Sleevi 2014/03/26 19:57:40 You say "servers", except you're only starting a s
lally 2014/03/28 16:22:51 The prior version of this test loaded up both stoc
+ EXPECT_TRUE(test_https_server->StartInBackground());
+ EXPECT_TRUE(test_https_server->BlockUntilStarted());
+
+ 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);
+
+ ResultCatcher catcher;
+ catcher.RestrictToProfile(browser()->profile());
+
+ ExtensionTestMessageListener listener("info_please", true);
+
+ ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("sockets_tcp/api")));
+ EXPECT_TRUE(listener.WaitUntilSatisfied());
+ listener.Reply(base::StringPrintf("https:%s:%d",
+ https_host_port_pair.host().c_str(),
+ https_port));
+
+ EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
+}

Powered by Google App Engine
This is Rietveld 408576698