Pass through readInfo.resultCode.

BUG=124498
TEST=added


Review URL: http://codereview.chromium.org/10168021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133501 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/extensions/api/socket/socket_api.cc

@@ -16,6 +16,7 @@ namespace extensions {
 
 const char kBytesWrittenKey[] = "bytesWritten";
 const char kDataKey[] = "data";
+const char kResultCodeKey[] = "resultCode";
 const char kSocketIdKey[] = "socketId";
 const char kTCPOption[] = "tcp";
 const char kUDPOption[] = "udp";
@@ -147,6 +148,7 @@ void SocketReadFunction::Work() {
       data_value->Set(i, Value::CreateIntegerValue(io_buffer_start[i]));
     }
   }
+  result->SetInteger(kResultCodeKey, bytes_read);
   result->Set(kDataKey, data_value);
   result_.reset(result);
 }

chrome/common/extensions/api/experimental.socket.idl

@@ -14,8 +14,9 @@
     // that blocked.
     DOMString type;
 
-    // The result code, if the event type is writeComplete. The result code
-    // description matches that of <code>writeInfo.bytesWritten</code>.
+    // The result code, if the event type is dataRead or writeComplete. The
+    // result code description matches the resultCode field in the immediate
+    // callback for the call that led to this event.
     long? resultCode;
 
     // The data read, if the event type is dataRead.
@@ -52,6 +53,9 @@
   callback ConnectCallback = void (long result);
 
   dictionary ReadInfo {
+    // The resultCode returned from the underlying read() call.
+    long resultCode;
+
     // The data received. Warning: will probably become a blob or other
     // appropriate binary-friendly type.
     // TODO(miket): [instanceOf=ArrayBuffer]object data;

chrome/test/data/extensions/api_test/socket/api/background.js

@@ -76,6 +76,10 @@ var testSocketCreation = function() {
 };
 
 function onDataRead(readInfo) {
+  if (readInfo.resultCode > 0 || readInfo.data.length > 0) {
+    chrome.test.assertEq(readInfo.resultCode, readInfo.data.length);
+  }
+
   // TODO(miket): this isn't correct for multiple calls of onDataRead.
   arrayBuffer2String(arrayOfLongsToArrayBuffer(readInfo.data), function(s) {
       dataAsString = s;  // save this for error reporting
@@ -115,7 +119,7 @@ function onEvent(socketEvent) {
   if (socketEvent.type == "connectComplete") {
     onConnectComplete(socketEvent.resultCode);
   } else if (socketEvent.type == "dataRead") {
-    onDataRead({data: socketEvent.data});
+    onDataRead({resultCode: socketEvent.resultCode, data: socketEvent.data});
   } else if (socketEvent.type == "writeComplete") {
     onWriteComplete(socketEvent.resultCode);
   } else {