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

Unified Diff: chrome/browser/extensions/api/socket/tcp_socket_unittest.cc

Issue 10919201: Make sure that a given app/extension requests only its own resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Improve tests; fix merge conflicts. Created 8 years, 3 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/socket/tcp_socket_unittest.cc
diff --git a/chrome/browser/extensions/api/socket/tcp_socket_unittest.cc b/chrome/browser/extensions/api/socket/tcp_socket_unittest.cc
index 16ae87967d50ba59a2c58493410d0759be5257b4..54fd8a9fa7f5a11275f88551e546c2ee2698f68b 100644
--- a/chrome/browser/extensions/api/socket/tcp_socket_unittest.cc
+++ b/chrome/browser/extensions/api/socket/tcp_socket_unittest.cc
@@ -43,9 +43,10 @@ class MockTCPSocket : public net::TCPClientSocket {
class MockApiResourceEventNotifier : public ApiResourceEventNotifier {
public:
- MockApiResourceEventNotifier() : ApiResourceEventNotifier(NULL, NULL,
- std::string(),
- 0, GURL()) {}
+ MockApiResourceEventNotifier(const std::string& owner_extension_id)
+ : ApiResourceEventNotifier(NULL, NULL,
+ owner_extension_id,
+ 0, GURL()) {}
MOCK_METHOD2(OnReadComplete, void(int result_code,
const std::string& message));
@@ -65,15 +66,17 @@ class CompleteHandler {
DISALLOW_COPY_AND_ASSIGN(CompleteHandler);
};
+const std::string FAKE_ID = "abcdefghijklmnopqrst";
TEST(SocketTest, TestTCPSocketRead) {
net::AddressList address_list;
MockTCPSocket* tcp_client_socket = new MockTCPSocket(address_list);
- ApiResourceEventNotifier* notifier = new MockApiResourceEventNotifier();
+ ApiResourceEventNotifier* notifier = new MockApiResourceEventNotifier(
+ FAKE_ID);
CompleteHandler handler;
scoped_ptr<TCPSocket> socket(TCPSocket::CreateSocketForTesting(
- tcp_client_socket, notifier));
+ tcp_client_socket, FAKE_ID, notifier));
EXPECT_CALL(*tcp_client_socket, Read(_, _, _))
.Times(1);
@@ -88,11 +91,12 @@ TEST(SocketTest, TestTCPSocketRead) {
TEST(SocketTest, TestTCPSocketWrite) {
net::AddressList address_list;
MockTCPSocket* tcp_client_socket = new MockTCPSocket(address_list);
- ApiResourceEventNotifier* notifier = new MockApiResourceEventNotifier();
+ ApiResourceEventNotifier* notifier = new MockApiResourceEventNotifier(
+ FAKE_ID);
CompleteHandler handler;
scoped_ptr<TCPSocket> socket(TCPSocket::CreateSocketForTesting(
- tcp_client_socket, notifier));
+ tcp_client_socket, FAKE_ID, notifier));
net::CompletionCallback callback;
EXPECT_CALL(*tcp_client_socket, Write(_, _, _))
@@ -111,11 +115,12 @@ TEST(SocketTest, TestTCPSocketWrite) {
TEST(SocketTest, TestTCPSocketBlockedWrite) {
net::AddressList address_list;
MockTCPSocket* tcp_client_socket = new MockTCPSocket(address_list);
- MockApiResourceEventNotifier* notifier = new MockApiResourceEventNotifier();
+ MockApiResourceEventNotifier* notifier = new MockApiResourceEventNotifier(
+ FAKE_ID);
CompleteHandler handler;
scoped_ptr<TCPSocket> socket(TCPSocket::CreateSocketForTesting(
- tcp_client_socket, notifier));
+ tcp_client_socket, FAKE_ID, notifier));
net::CompletionCallback callback;
EXPECT_CALL(*tcp_client_socket, Write(_, _, _))
@@ -137,11 +142,12 @@ TEST(SocketTest, TestTCPSocketBlockedWrite) {
TEST(SocketTest, TestTCPSocketBlockedWriteReentry) {
net::AddressList address_list;
MockTCPSocket* tcp_client_socket = new MockTCPSocket(address_list);
- MockApiResourceEventNotifier* notifier = new MockApiResourceEventNotifier();
+ MockApiResourceEventNotifier* notifier = new MockApiResourceEventNotifier(
+ FAKE_ID);
CompleteHandler handlers[5];
scoped_ptr<TCPSocket> socket(TCPSocket::CreateSocketForTesting(
- tcp_client_socket, notifier));
+ tcp_client_socket, FAKE_ID, notifier));
net::CompletionCallback callback;
EXPECT_CALL(*tcp_client_socket, Write(_, _, _))
@@ -170,10 +176,11 @@ TEST(SocketTest, TestTCPSocketBlockedWriteReentry) {
TEST(SocketTest, TestTCPSocketSetNoDelay) {
net::AddressList address_list;
MockTCPSocket* tcp_client_socket = new MockTCPSocket(address_list);
- MockApiResourceEventNotifier* notifier = new MockApiResourceEventNotifier();
+ MockApiResourceEventNotifier* notifier = new MockApiResourceEventNotifier(
+ FAKE_ID);
scoped_ptr<TCPSocket> socket(TCPSocket::CreateSocketForTesting(
- tcp_client_socket, notifier));
+ tcp_client_socket, FAKE_ID, notifier));
bool no_delay = false;
EXPECT_CALL(*tcp_client_socket, SetNoDelay(_))
@@ -193,10 +200,11 @@ TEST(SocketTest, TestTCPSocketSetNoDelay) {
TEST(SocketTest, TestTCPSocketSetKeepAlive) {
net::AddressList address_list;
MockTCPSocket* tcp_client_socket = new MockTCPSocket(address_list);
- MockApiResourceEventNotifier* notifier = new MockApiResourceEventNotifier();
+ MockApiResourceEventNotifier* notifier = new MockApiResourceEventNotifier(
+ FAKE_ID);
scoped_ptr<TCPSocket> socket(TCPSocket::CreateSocketForTesting(
- tcp_client_socket, notifier));
+ tcp_client_socket, FAKE_ID, notifier));
bool enable = false;
int delay = 0;
« no previous file with comments | « chrome/browser/extensions/api/socket/tcp_socket.cc ('k') | chrome/browser/extensions/api/socket/udp_socket.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698