Remove cronet dependency on org.apache.http.

components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequest.java

Index: components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequest.java
diff --git a/components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequest.java b/components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequest.java
index afccf847f9aa8950ba57bb0a907eb20cd0b00b86..f369e069494fb9ddc339456bc24541035d655ada 100644
--- a/components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequest.java
+++ b/components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequest.java
@@ -6,13 +6,13 @@ package org.chromium.net;
 
 import android.util.Log;
 
-import org.apache.http.conn.ConnectTimeoutException;
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 import org.chromium.base.annotations.SuppressFBWarnings;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
+import java.net.SocketTimeoutException;
 import java.net.URL;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
@@ -186,7 +186,7 @@ public class ChromiumUrlRequest implements HttpUrlRequest {
             case ChromiumUrlRequestError.MALFORMED_URL:
                 return new MalformedURLException("Malformed URL: " + mUrl);
             case ChromiumUrlRequestError.CONNECTION_TIMED_OUT:
-                return new ConnectTimeoutException("Connection timed out");
+                return new SocketTimeoutException("Connection timed out");

[Yaron, 2015/05/15 15:20:21]

Not sure how we originally chose ConnectTimeoutException but it subclasses
InterruptedIoException which this one does too. Alternatively, I could define a
custom exception and throw that if you want to be more specific.

             case ChromiumUrlRequestError.UNKNOWN_HOST:
                 String host;
                 try {