Refactor the socket API to remove onEvent callback in socket.create() function.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // net/tools/testserver/testserver.py is picky about the format of what it
 // calls its "echo" messages. One might go so far as to mutter to oneself that
 // it isn't an echo server at all.
 //
 // The response is based on the request but obfuscated using a random key.
 const request = "0100000005320000005hello";
@@ skipping 54 matching lines @@
     chrome.test.assertTrue(socketInfo.socketId > 0);
 
     // TODO(miket): this doesn't work yet. It's possible this will become
     // automatic, but either way we can't forget to clean up.
     //
     //socket.destroy(socketInfo.socketId);
 
     chrome.test.succeed();
   }
 
-  socket.create(protocol, {onEvent: function(e) {}}, onCreate);
+  socket.create(protocol, {}, onCreate);
 };
 
 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
       if (s.match(expectedResponsePattern)) {
         succeeded = true;
         chrome.test.succeed();
       }
     });
-  // Blocked. Wait for onEvent.
 }
 
 function onWriteOrSendToComplete(writeInfo) {
   bytesWritten += writeInfo.bytesWritten;
   if (bytesWritten == request.length) {
     if (protocol == "tcp")
       socket.read(socketId, onDataRead);
     else
       socket.recvFrom(socketId, onDataRead);
   }
-  // Blocked. Wait for onEvent.
 }
 
 function onConnectOrBindComplete(connectResult) {
   if (connectResult == 0) {
     string2ArrayBuffer(request, function(arrayBuffer) {
         var longs = arrayBufferToArrayOfLongs(arrayBuffer);
         if (protocol == "tcp")
           socket.write(socketId, longs, onWriteOrSendToComplete);
         else
           socket.sendTo(socketId, longs, address, port,
               onWriteOrSendToComplete);
       });
   }
-  // Blocked. Wait for onEvent.
 }
 
 function onCreate(socketInfo) {
   socketId = socketInfo.socketId;
   chrome.test.assertTrue(socketId > 0, "failed to create socket");
   if (protocol == "tcp")
     socket.connect(socketId, address, port, onConnectOrBindComplete);
   else
     socket.bind(socketId, "0.0.0.0", 0, onConnectOrBindComplete);
 }
 
-function onEvent(socketEvent) {
-  if (socketEvent.type == "connectComplete") {
-    onConnectOrBindComplete(socketEvent.resultCode);
-  } else if (socketEvent.type == "dataRead") {
-    onDataRead({resultCode: socketEvent.resultCode, data: socketEvent.data});
-  } else if (socketEvent.type == "writeComplete") {
-    onWriteOnSendToComplete(socketEvent.resultCode);
-  } else {
-    console.log("Received unhandled socketEvent of type " + socketEvent.type);
-  }
-};
-
 function waitForBlockingOperation() {
   if (++waitCount < 10) {
     setTimeout(waitForBlockingOperation, 1000);
   } else {
     // We weren't able to succeed in the given time.
     chrome.test.fail("Operations didn't complete after " + waitCount + " " +
                      "seconds. Response so far was <" + dataAsString + ">.");
   }
 }
 
 var testSending = function() {
   dataRead = "";
   succeeded = false;
   waitCount = 0;
 
   setTimeout(waitForBlockingOperation, 1000);
-  socket.create(protocol, {onEvent: onEvent}, onCreate);
+  socket.create(protocol, {}, onCreate);
 };
 
 var onMessageReply = function(message) {
   var parts = message.split(":");
   protocol = parts[0];
   address = parts[1];
   port = parseInt(parts[2]);
   console.log("Running tests, protocol " + protocol + ", echo server " +
               address + ":" + port);
   chrome.test.runTests([ testSocketCreation, testSending ]);
 };
 
 // Find out which protocol we're supposed to test, and which echo server we
 // should be using, then kick off the tests.
 chrome.test.sendMessage("info_please", onMessageReply);