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

Unified Diff: chrome/test/data/extensions/api_test/socket/api/background.js

Issue 10134008: Add bind(), recvFrom(), sendTo() for UDP socket. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Reenable api tests Created 8 years, 8 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/test/data/extensions/api_test/socket/api/background.js
diff --git a/chrome/test/data/extensions/api_test/socket/api/background.js b/chrome/test/data/extensions/api_test/socket/api/background.js
index 576fd2e0112326304312dc0f21def97160fa4a09..2f8b1a77a37be2a456946aa8c3102f94a2e469b6 100644
--- a/chrome/test/data/extensions/api_test/socket/api/background.js
+++ b/chrome/test/data/extensions/api_test/socket/api/background.js
@@ -72,7 +72,7 @@ var testSocketCreation = function() {
chrome.test.succeed();
}
- socket.create(protocol, address, port, {onEvent: function(e) {}}, onCreate);
+ socket.create(protocol, {onEvent: function(e) {}}, onCreate);
};
function onDataRead(readInfo) {
@@ -87,19 +87,26 @@ function onDataRead(readInfo) {
// Blocked. Wait for onEvent.
}
-function onWriteComplete(writeInfo) {
+function onWriteOrSendToComplete(writeInfo) {
bytesWritten += writeInfo.bytesWritten;
if (bytesWritten == request.length) {
- socket.read(socketId, onDataRead);
+ if (protocol == "tcp")
+ socket.read(socketId, onDataRead);
+ else
+ socket.recvFrom(socketId, onDataRead);
}
// Blocked. Wait for onEvent.
}
-function onConnectComplete(connectResult) {
+function onConnectOrBindComplete(connectResult) {
if (connectResult == 0) {
string2ArrayBuffer(request, function(arrayBuffer) {
var longs = arrayBufferToArrayOfLongs(arrayBuffer);
- socket.write(socketId, longs, onWriteComplete);
+ if (protocol == "tcp")
+ socket.write(socketId, longs, onWriteOrSendToComplete);
+ else
+ socket.sendTo(socketId, longs, address, port,
+ onWriteOrSendToComplete);
});
}
// Blocked. Wait for onEvent.
@@ -108,16 +115,20 @@ function onConnectComplete(connectResult) {
function onCreate(socketInfo) {
socketId = socketInfo.socketId;
chrome.test.assertTrue(socketId > 0, "failed to create socket");
- socket.connect(socketId, onConnectComplete);
+ if (protocol == "tcp")
+ socket.connect(socketId, address, port, onConnectOrBindComplete);
+ else
+ socket.bind(socketId, "0.0.0.0", 0, onConnectOrBindComplete);
}
function onEvent(socketEvent) {
+ console.log(socketEvent);
if (socketEvent.type == "connectComplete") {
- onConnectComplete(socketEvent.resultCode);
+ onConnectOrBindComplete(socketEvent.resultCode);
} else if (socketEvent.type == "dataRead") {
onDataRead({data: socketEvent.data});
} else if (socketEvent.type == "writeComplete") {
- onWriteComplete(socketEvent.resultCode);
+ onWriteOnSendToComplete(socketEvent.resultCode);
} else {
console.log("Received unhandled socketEvent of type " + socketEvent.type);
}
@@ -139,7 +150,7 @@ var testSending = function() {
waitCount = 0;
setTimeout(waitForBlockingOperation, 1000);
- socket.create(protocol, address, port, { onEvent: onEvent }, onCreate);
+ socket.create(protocol, {onEvent: onEvent}, onCreate);
};
var onMessageReply = function(message) {

Powered by Google App Engine
This is Rietveld 408576698