diff -r bb6160d0b6f2 -r 22f918ed49f7 org.chromium.sdk/src/org/chromium/sdk/internal/transport/Handshaker.java
--- a/org.chromium.sdk/src/org/chromium/sdk/internal/transport/Handshaker.java	Thu Jan 28 10:18:04 2010 -0800
+++ b/org.chromium.sdk/src/org/chromium/sdk/internal/transport/Handshaker.java	Thu Jan 28 11:27:14 2010 -0800
@@ -10,8 +10,8 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.FutureTask;
-import java.util.concurrent.RunnableFuture;
 
+import org.chromium.sdk.ChromiumIOException;
 import org.chromium.sdk.LineReader;
 import org.chromium.sdk.internal.transport.Message.MalformedMessageException;
 
@@ -85,7 +85,7 @@
       return runnableFuture;
     }
 
-    private final RunnableFuture<RemoteInfo> runnableFuture =
+    private final FutureTask<RemoteInfo> runnableFuture =
         new FutureTask<RemoteInfo>(new HandshakeTaks());
 
     private LineReader input = null;
@@ -100,7 +100,7 @@
       } catch (InterruptedException e) {
         throw new RuntimeException(e);
       } catch (ExecutionException e) {
-        throw new IOException("Failed to perform handshake", e);
+        throw new ChromiumIOException("Failed to perform handshake", e);
       }
 
     }
@@ -111,7 +111,7 @@
         try {
           message = Message.fromBufferedReader(input);
         } catch (MalformedMessageException e) {
-          throw new IOException("Unrecognized handshake message from remote", e);
+          throw new ChromiumIOException("Unrecognized handshake message from remote", e);
         }
         if (message == null) {
           throw new IOException("End of stream");