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

Unified Diff: extensions/browser/api/cast_channel/cast_channel_apitest.cc

Issue 2559283003: remove CHANNEL_AUTH_TYPE_SSL from ChannelAuthType (Closed)
Patch Set: Fixing browser api tests + rebase Created 4 years 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: extensions/browser/api/cast_channel/cast_channel_apitest.cc
diff --git a/extensions/browser/api/cast_channel/cast_channel_apitest.cc b/extensions/browser/api/cast_channel/cast_channel_apitest.cc
index fd972f7fd4809bae983d9cdfb5e25223a3ae9497..565f616aaa5262fe1d20e14f44b56f179ccf004b 100644
--- a/extensions/browser/api/cast_channel/cast_channel_apitest.cc
+++ b/extensions/browser/api/cast_channel/cast_channel_apitest.cc
@@ -108,7 +108,7 @@ class CastChannelAPITest : public ExtensionApiTest {
ON_CALL(*mock_cast_socket_, ip_endpoint())
.WillByDefault(ReturnRef(ip_endpoint_));
ON_CALL(*mock_cast_socket_, channel_auth())
- .WillByDefault(Return(cast_channel::CHANNEL_AUTH_TYPE_SSL));
+ .WillByDefault(Return(cast_channel::CHANNEL_AUTH_TYPE_SSL_VERIFIED));
ON_CALL(*mock_cast_socket_, keep_alive()).WillByDefault(Return(false));
}
@@ -388,16 +388,18 @@ IN_PROC_BROWSER_TEST_F(CastChannelAPITest, TestOpenInvalidConnectInfo) {
cast_channel_open_function = CreateOpenFunction(empty_extension);
std::string error = utils::RunFunctionAndReturnError(
cast_channel_open_function.get(),
- "[{\"ipAddress\": \"invalid_ip\", \"port\": 8009, \"auth\": \"ssl\"}]",
+ "[{\"ipAddress\": \"invalid_ip\", \"port\": 8009, \"auth\": "
+ "\"ssl_verified\"}]",
browser());
EXPECT_EQ(error, "Invalid connect_info (invalid IP address)");
// Invalid port
cast_channel_open_function = CreateOpenFunction(empty_extension);
- error = utils::RunFunctionAndReturnError(
- cast_channel_open_function.get(),
- "[{\"ipAddress\": \"127.0.0.1\", \"port\": -200, \"auth\": \"ssl\"}]",
- browser());
+ error = utils::RunFunctionAndReturnError(cast_channel_open_function.get(),
+ "[{\"ipAddress\": \"127.0.0.1\", "
+ "\"port\": -200, \"auth\": "
+ "\"ssl_verified\"}]",
+ browser());
EXPECT_EQ(error, "Invalid connect_info (invalid port)");
}
@@ -415,7 +417,7 @@ IN_PROC_BROWSER_TEST_F(CastChannelAPITest, TestSendInvalidMessageInfo) {
"\"audioOnly\": false, "
"\"connectInfo\": "
"{\"ipAddress\": \"127.0.0.1\", \"port\": 8009, "
- "\"auth\": \"ssl\"}, \"readyState\": \"open\"}, "
+ "\"auth\": \"ssl_verified\"}, \"readyState\": \"open\"}, "
"{\"namespace_\": \"foo\", \"sourceId\": \"src\", "
"\"destinationId\": \"dest\", \"data\": 1235}]",
browser()));
@@ -430,7 +432,7 @@ IN_PROC_BROWSER_TEST_F(CastChannelAPITest, TestSendInvalidMessageInfo) {
"\"audioOnly\": false, "
"\"connectInfo\": "
"{\"ipAddress\": \"127.0.0.1\", \"port\": 8009, "
- "\"auth\": \"ssl\"}, \"readyState\": \"open\"}, "
+ "\"auth\": \"ssl_verified\"}, \"readyState\": \"open\"}, "
"{\"namespace_\": \"\", \"sourceId\": \"src\", "
"\"destinationId\": \"dest\", \"data\": \"data\"}]",
browser());
@@ -445,7 +447,7 @@ IN_PROC_BROWSER_TEST_F(CastChannelAPITest, TestSendInvalidMessageInfo) {
"\"audioOnly\": false, "
"\"connectInfo\": "
"{\"ipAddress\": \"127.0.0.1\", \"port\": 8009, "
- "\"auth\": \"ssl\"}, \"readyState\": \"open\"}, "
+ "\"auth\": \"ssl_verified\"}, \"readyState\": \"open\"}, "
"{\"namespace_\": \"foo\", \"sourceId\": \"\", "
"\"destinationId\": \"dest\", \"data\": \"data\"}]",
browser());
@@ -460,7 +462,7 @@ IN_PROC_BROWSER_TEST_F(CastChannelAPITest, TestSendInvalidMessageInfo) {
"\"audioOnly\": false, "
"\"connectInfo\": "
"{\"ipAddress\": \"127.0.0.1\", \"port\": 8009, "
- "\"auth\": \"ssl\"}, \"readyState\": \"open\"}, "
+ "\"auth\": \"ssl_verified\"}, \"readyState\": \"open\"}, "
"{\"namespace_\": \"foo\", \"sourceId\": \"src\", "
"\"destinationId\": \"\", \"data\": \"data\"}]",
browser());
« no previous file with comments | « extensions/browser/api/cast_channel/cast_channel_api_unittest.cc ('k') | extensions/browser/api/cast_channel/cast_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698