Fixing all Java import ordering issues.

BUG=320711
TBR=isherman@chromium.org
NOTRY=true

Review URL: https://codereview.chromium.org/110963003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239823 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 19 insertions, 41 deletions

diff --git a/net/android/java/src/org/chromium/net/AndroidKeyStore.java b/net/android/java/src/org/chromium/net/AndroidKeyStore.java
index de5d8f2..bc25bf3 100644
--- a/net/android/java/src/org/chromium/net/AndroidKeyStore.java
+++ b/net/android/java/src/org/chromium/net/AndroidKeyStore.java
@@ -6,25 +6,22 @@ package org.chromium.net;
 
 import android.util.Log;
 
-import java.lang.reflect.InvocationTargetException;
+import org.chromium.base.CalledByNative;
+import org.chromium.base.JNINamespace;
+
 import java.lang.reflect.Method;
-import java.math.BigInteger;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.Signature;
 import java.security.interfaces.DSAKey;
-import java.security.interfaces.DSAPrivateKey;
 import java.security.interfaces.DSAParams;
+import java.security.interfaces.DSAPrivateKey;
 import java.security.interfaces.ECKey;
 import java.security.interfaces.ECPrivateKey;
 import java.security.interfaces.RSAKey;
 import java.security.interfaces.RSAPrivateKey;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.Signature;
 import java.security.spec.ECParameterSpec;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
-import org.chromium.net.PrivateKeyType;;
-
 @JNINamespace("net::android")
 public class AndroidKeyStore {
 
diff --git a/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java b/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
index b7aec32..2d51f42 100644
--- a/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
+++ b/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
@@ -12,8 +12,6 @@ import android.util.Log;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.CalledByNativeUnchecked;
-import org.chromium.net.CertVerifyResultAndroid;
-import org.chromium.net.CertificateMimeType;
 
 import java.net.Inet6Address;
 import java.net.InetAddress;
@@ -25,7 +23,6 @@ import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;
 import java.util.Enumeration;
-import java.util.List;
 
 /**
  * This class implements net utilities required by the net component.
diff --git a/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java b/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java
index 038cb31..2c9650a 100644
--- a/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java
+++ b/net/android/java/src/org/chromium/net/NetworkChangeNotifierAutoDetect.java
@@ -9,7 +9,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
diff --git a/net/android/java/src/org/chromium/net/X509Util.java b/net/android/java/src/org/chromium/net/X509Util.java
index 4358f2b..0ded54d 100644
--- a/net/android/java/src/org/chromium/net/X509Util.java
+++ b/net/android/java/src/org/chromium/net/X509Util.java
@@ -12,7 +12,6 @@ import android.security.KeyChain;
 import android.util.Log;
 
 import org.chromium.base.JNINamespace;
-import org.chromium.net.CertVerifyResultAndroid;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -21,9 +20,8 @@ import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateExpiredException;
-import java.security.cert.CertificateNotYetValidException;
 import java.security.cert.CertificateFactory;
-import java.security.cert.CertificateParsingException;
+import java.security.cert.CertificateNotYetValidException;
 import java.security.cert.X509Certificate;
 import java.util.List;
 
diff --git a/net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java b/net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java
index 460dc50..58dd26a 100644
--- a/net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java
+++ b/net/android/javatests/src/org/chromium/net/AndroidKeyStoreTestUtil.java
@@ -4,22 +4,17 @@
 
 package org.chromium.net;
 
-import android.os.Build;
 import android.util.Log;
 
-import java.security.PrivateKey;
-import java.security.PrivateKey;
-import java.security.Signature;
+import org.chromium.base.CalledByNative;
+import org.chromium.base.JNINamespace;
+
 import java.security.KeyFactory;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.spec.InvalidKeySpecException;
 import java.security.spec.KeySpec;
 import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.KeyStoreException;
-import java.security.spec.InvalidKeySpecException;
-import java.security.NoSuchAlgorithmException;
-
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
-import org.chromium.net.PrivateKeyType;
 
 @JNINamespace("net::android")
 public class AndroidKeyStoreTestUtil {
diff --git a/net/android/javatests/src/org/chromium/net/AndroidProxySelectorTest.java b/net/android/javatests/src/org/chromium/net/AndroidProxySelectorTest.java
index c705f69..70143c5 100644
--- a/net/android/javatests/src/org/chromium/net/AndroidProxySelectorTest.java
+++ b/net/android/javatests/src/org/chromium/net/AndroidProxySelectorTest.java
@@ -17,6 +17,8 @@ package org.chromium.net;
 import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 
+import org.chromium.base.test.util.Feature;
+
 import java.net.Proxy;
 import java.net.ProxySelector;
 import java.net.URI;
@@ -24,8 +26,6 @@ import java.net.URISyntaxException;
 import java.util.List;
 import java.util.Properties;
 
-import org.chromium.base.test.util.Feature;
-
 public class AndroidProxySelectorTest extends InstrumentationTestCase {
     Properties mProperties;
 
diff --git a/net/android/javatests/src/org/chromium/net/X509UtilTest.java b/net/android/javatests/src/org/chromium/net/X509UtilTest.java
index e5c3f6f..6e27b1a 100644
--- a/net/android/javatests/src/org/chromium/net/X509UtilTest.java
+++ b/net/android/javatests/src/org/chromium/net/X509UtilTest.java
@@ -4,27 +4,19 @@
 
 package org.chromium.net;
 
-import android.content.Context;
-import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.telephony.TelephonyManager;
-import android.test.UiThreadTest;
-import android.test.suitebuilder.annotation.MediumTest;
 import android.test.InstrumentationTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
 import android.util.Base64;
 
+import org.chromium.base.PathUtils;
+
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.security.GeneralSecurityException;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateParsingException;
-import java.security.cert.X509Certificate;
 import java.util.Arrays;
 
-import org.chromium.base.PathUtils;
-
 /**
  * Tests for org.chromium.net.X509Util.
  */