Revert 291214 "Fixes three crashes" in an attempt to find the cause of Athena related unit test fai…

trunk/src/athena/system/device_socket_listener.h

Index: trunk/src/athena/system/device_socket_listener.h
===================================================================
--- trunk/src/athena/system/device_socket_listener.h	(revision 291393)
+++ trunk/src/athena/system/device_socket_listener.h	(working copy)
@@ -27,10 +27,10 @@
       scoped_refptr<base::TaskRunner> io_task_runner);
   static void ShutdownSocketManager();
 
-  // This is called on the FILE thread when data is available on the socket.
+  // This is called on the IO thread when data is available on the socket.
   // |data| is guaranteed to be of exactly |data_size| length. Note that the
   // implementation must not mutate or free the data.
-  virtual void OnDataAvailableOnFILE(const void* data) = 0;
+  virtual void OnDataAvailableOnIO(const void* data) = 0;
 
  protected:
   void StartListening();