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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/extensions/permissions/socket_permission_unittest.cc

Issue 10993078: Use extensions socket permission for TCP/UDP socket APIs in Pepper (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed Android build Created 8 years, 1 month 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
« no previous file with comments | « chrome/common/extensions/permissions/socket_permission_data.cc ('k') | content/browser/renderer_host/pepper/pepper_message_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/permissions/socket_permission_unittest.cc
diff --git a/chrome/common/extensions/permissions/socket_permission_unittest.cc b/chrome/common/extensions/permissions/socket_permission_unittest.cc
index a2cdd269c1a374dace3f456c2ccd7fd741292708..7ed1a52d0b8b52cd961cddd69adb45da8e992d86 100644
--- a/chrome/common/extensions/permissions/socket_permission_unittest.cc
+++ b/chrome/common/extensions/permissions/socket_permission_unittest.cc
@@ -12,6 +12,7 @@
#include "ipc/ipc_message.h"
#include "testing/gtest/include/gtest/gtest.h"
+using content::SocketPermissionRequest;
using extensions::SocketPermissionData;
namespace {
@@ -139,59 +140,59 @@ TEST(SocketPermissionTest, Match) {
SocketPermissionData data;
CHECK(data.Parse("tcp-connect"));
- EXPECT_TRUE(data.Match(
- SocketPermissionData::TCP_CONNECT, "www.example.com", 80));
- EXPECT_FALSE(data.Match(
- SocketPermissionData::UDP_SEND_TO, "www.example.com", 80));
+ EXPECT_TRUE(data.Match(SocketPermissionRequest(
+ SocketPermissionRequest::TCP_CONNECT, "www.example.com", 80)));
+ EXPECT_FALSE(data.Match(SocketPermissionRequest(
+ SocketPermissionRequest::UDP_SEND_TO, "www.example.com", 80)));
CHECK(data.Parse("udp-send-to::8800"));
- EXPECT_TRUE(data.Match(
- SocketPermissionData::UDP_SEND_TO, "www.example.com", 8800));
- EXPECT_TRUE(data.Match(
- SocketPermissionData::UDP_SEND_TO, "smtp.example.com", 8800));
- EXPECT_FALSE(data.Match(
- SocketPermissionData::TCP_CONNECT, "www.example.com", 80));
+ EXPECT_TRUE(data.Match(SocketPermissionRequest(
+ SocketPermissionRequest::UDP_SEND_TO, "www.example.com", 8800)));
+ EXPECT_TRUE(data.Match(SocketPermissionRequest(
+ SocketPermissionRequest::UDP_SEND_TO, "smtp.example.com", 8800)));
+ EXPECT_FALSE(data.Match(SocketPermissionRequest(
+ SocketPermissionRequest::TCP_CONNECT, "www.example.com", 80)));
CHECK(data.Parse("udp-send-to:*.example.com:8800"));
- EXPECT_TRUE(data.Match(
- SocketPermissionData::UDP_SEND_TO, "www.example.com", 8800));
- EXPECT_TRUE(data.Match(
- SocketPermissionData::UDP_SEND_TO, "smtp.example.com", 8800));
- EXPECT_TRUE(data.Match(
- SocketPermissionData::UDP_SEND_TO, "SMTP.example.com", 8800));
- EXPECT_FALSE(data.Match(
- SocketPermissionData::TCP_CONNECT, "www.example.com", 80));
- EXPECT_FALSE(data.Match(
- SocketPermissionData::UDP_SEND_TO, "www.google.com", 8800));
- EXPECT_FALSE(data.Match(
- SocketPermissionData::UDP_SEND_TO, "wwwexample.com", 8800));
+ EXPECT_TRUE(data.Match(SocketPermissionRequest(
+ SocketPermissionRequest::UDP_SEND_TO, "www.example.com", 8800)));
+ EXPECT_TRUE(data.Match(SocketPermissionRequest(
+ SocketPermissionRequest::UDP_SEND_TO, "smtp.example.com", 8800)));
+ EXPECT_TRUE(data.Match(SocketPermissionRequest(
+ SocketPermissionRequest::UDP_SEND_TO, "SMTP.example.com", 8800)));
+ EXPECT_FALSE(data.Match(SocketPermissionRequest(
+ SocketPermissionRequest::TCP_CONNECT, "www.example.com", 80)));
+ EXPECT_FALSE(data.Match(SocketPermissionRequest(
+ SocketPermissionRequest::UDP_SEND_TO, "www.google.com", 8800)));
+ EXPECT_FALSE(data.Match(SocketPermissionRequest(
+ SocketPermissionRequest::UDP_SEND_TO, "wwwexample.com", 8800)));
CHECK(data.Parse("udp-send-to:*.ExAmPlE.cOm:8800"));
- EXPECT_TRUE(data.Match(
- SocketPermissionData::UDP_SEND_TO, "www.example.com", 8800));
- EXPECT_TRUE(data.Match(
- SocketPermissionData::UDP_SEND_TO, "smtp.example.com", 8800));
- EXPECT_TRUE(data.Match(
- SocketPermissionData::UDP_SEND_TO, "SMTP.example.com", 8800));
- EXPECT_FALSE(data.Match(
- SocketPermissionData::TCP_CONNECT, "www.example.com", 80));
- EXPECT_FALSE(data.Match(
- SocketPermissionData::UDP_SEND_TO, "www.google.com", 8800));
+ EXPECT_TRUE(data.Match(SocketPermissionRequest(
+ SocketPermissionRequest::UDP_SEND_TO, "www.example.com", 8800)));
+ EXPECT_TRUE(data.Match(SocketPermissionRequest(
+ SocketPermissionRequest::UDP_SEND_TO, "smtp.example.com", 8800)));
+ EXPECT_TRUE(data.Match(SocketPermissionRequest(
+ SocketPermissionRequest::UDP_SEND_TO, "SMTP.example.com", 8800)));
+ EXPECT_FALSE(data.Match(SocketPermissionRequest(
+ SocketPermissionRequest::TCP_CONNECT, "www.example.com", 80)));
+ EXPECT_FALSE(data.Match(SocketPermissionRequest(
+ SocketPermissionRequest::UDP_SEND_TO, "www.google.com", 8800)));
CHECK(data.Parse("udp-bind::8800"));
- EXPECT_TRUE(data.Match(
- SocketPermissionData::UDP_BIND, "127.0.0.1", 8800));
- EXPECT_FALSE(data.Match(
- SocketPermissionData::UDP_BIND, "127.0.0.1", 8888));
- EXPECT_FALSE(data.Match(
- SocketPermissionData::TCP_CONNECT, "www.example.com", 80));
- EXPECT_FALSE(data.Match(
- SocketPermissionData::UDP_SEND_TO, "www.google.com", 8800));
+ EXPECT_TRUE(data.Match(SocketPermissionRequest(
+ SocketPermissionRequest::UDP_BIND, "127.0.0.1", 8800)));
+ EXPECT_FALSE(data.Match(SocketPermissionRequest(
+ SocketPermissionRequest::UDP_BIND, "127.0.0.1", 8888)));
+ EXPECT_FALSE(data.Match(SocketPermissionRequest(
+ SocketPermissionRequest::TCP_CONNECT, "www.example.com", 80)));
+ EXPECT_FALSE(data.Match(SocketPermissionRequest(
+ SocketPermissionRequest::UDP_SEND_TO, "www.google.com", 8800)));
// Do not wildcard part of ip address.
CHECK(data.Parse("tcp-connect:*.168.0.1:8800"));
- EXPECT_FALSE(data.Match(
- SocketPermissionData::TCP_CONNECT, "192.168.0.1", 8800));
+ EXPECT_FALSE(data.Match(SocketPermissionRequest(
+ SocketPermissionRequest::TCP_CONNECT, "192.168.0.1", 8800)));
}
TEST(SocketPermissionTest, IPC) {
« no previous file with comments | « chrome/common/extensions/permissions/socket_permission_data.cc ('k') | content/browser/renderer_host/pepper/pepper_message_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698