Remove cronet dependency on org.apache.http.

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

 // Copyright 2014 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.
 
 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;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.WritableByteChannel;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ skipping 153 matching lines @@
             case ChromiumUrlRequestError.SUCCESS:
                 if (mContentLengthOverLimit) {
                     return new ResponseTooLargeException();
                 }
                 return null;
             case ChromiumUrlRequestError.UNKNOWN:
                 return new IOException(mErrorString);
             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 {
                     host = new URL(mUrl).getHost();
                 } catch (MalformedURLException e) {
                     host = mUrl;
                 }
                 return new UnknownHostException("Unknown host: " + host);
             case ChromiumUrlRequestError.TOO_MANY_REDIRECTS:
                 return new IOException("Request failed because there were too "
@@ skipping 557 matching lines @@
 
     private native String nativeGetNegotiatedProtocol(long urlRequestAdapter);
 
     private native boolean nativeGetWasCached(long urlRequestAdapter);
 
     // Explicit class to work around JNI-generator generics confusion.
     private static class ResponseHeadersMap extends
             HashMap<String, List<String>> {
     }
 }