Fix imports for webkit code.
A follow up after factor to make it so androidx imports go in the
correct order.
Test: ./gradlew buildOnServer
Change-Id: If022a8f1fabe2fc62efeb14d6008232e14a2af77
diff --git a/webkit/src/androidTest/java/androidx/webkit/WebViewCompatTest.java b/webkit/src/androidTest/java/androidx/webkit/WebViewCompatTest.java
index 618278f..3c64b9c 100644
--- a/webkit/src/androidTest/java/androidx/webkit/WebViewCompatTest.java
+++ b/webkit/src/androidTest/java/androidx/webkit/WebViewCompatTest.java
@@ -29,13 +29,14 @@
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.MediumTest;
import android.support.test.runner.AndroidJUnit4;
-import androidx.core.os.BuildCompat;
import android.webkit.SafeBrowsingResponse;
import android.webkit.ValueCallback;
import android.webkit.WebResourceRequest;
import android.webkit.WebView;
import android.webkit.WebViewClient;
+import androidx.core.os.BuildCompat;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/webkit/src/main/java/androidx/webkit/WebViewCompat.java b/webkit/src/main/java/androidx/webkit/WebViewCompat.java
index e6ea267..6a48e35 100644
--- a/webkit/src/main/java/androidx/webkit/WebViewCompat.java
+++ b/webkit/src/main/java/androidx/webkit/WebViewCompat.java
@@ -20,11 +20,15 @@
import android.net.Uri;
import android.os.Build;
import android.os.Looper;
+import android.webkit.ValueCallback;
+import android.webkit.WebView;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.os.BuildCompat;
-import android.webkit.ValueCallback;
-import android.webkit.WebView;
+import androidx.webkit.internal.WebViewGlueCommunicator;
+import androidx.webkit.internal.WebViewProviderAdapter;
+import androidx.webkit.internal.WebViewProviderFactoryAdapter;
import org.chromium.support_lib_boundary.WebViewProviderBoundaryInterface;
@@ -32,10 +36,6 @@
import java.lang.reflect.Method;
import java.util.List;
-import androidx.webkit.internal.WebViewGlueCommunicator;
-import androidx.webkit.internal.WebViewProviderAdapter;
-import androidx.webkit.internal.WebViewProviderFactoryAdapter;
-
/**
* Compatibility version of {@link android.webkit.WebView}
*/
diff --git a/webkit/src/main/java/androidx/webkit/internal/VisualStateCallbackAdapter.java b/webkit/src/main/java/androidx/webkit/internal/VisualStateCallbackAdapter.java
index c6917d8..4e95e22 100644
--- a/webkit/src/main/java/androidx/webkit/internal/VisualStateCallbackAdapter.java
+++ b/webkit/src/main/java/androidx/webkit/internal/VisualStateCallbackAdapter.java
@@ -16,10 +16,10 @@
package androidx.webkit.internal;
-import org.chromium.support_lib_boundary.VisualStateCallbackBoundaryInterface;
-
import androidx.webkit.WebViewCompat;
+import org.chromium.support_lib_boundary.VisualStateCallbackBoundaryInterface;
+
/**
* Adapter between WebViewCompat.VisualStateCallback and VisualStateCallbackBoundaryInterface (the
* corresponding interface shared with the support library glue in the WebView APK).
diff --git a/webkit/src/main/java/androidx/webkit/internal/WebViewGlueCommunicator.java b/webkit/src/main/java/androidx/webkit/internal/WebViewGlueCommunicator.java
index da10713..6546fcf 100644
--- a/webkit/src/main/java/androidx/webkit/internal/WebViewGlueCommunicator.java
+++ b/webkit/src/main/java/androidx/webkit/internal/WebViewGlueCommunicator.java
@@ -16,9 +16,10 @@
package androidx.webkit.internal;
-import androidx.core.os.BuildCompat;
import android.webkit.WebView;
+import androidx.core.os.BuildCompat;
+
import org.chromium.support_lib_boundary.WebViewProviderFactoryBoundaryInterface;
import org.chromium.support_lib_boundary.util.BoundaryInterfaceReflectionUtil;
diff --git a/webkit/src/main/java/androidx/webkit/internal/WebViewProviderAdapter.java b/webkit/src/main/java/androidx/webkit/internal/WebViewProviderAdapter.java
index 2093e0b..c440892 100644
--- a/webkit/src/main/java/androidx/webkit/internal/WebViewProviderAdapter.java
+++ b/webkit/src/main/java/androidx/webkit/internal/WebViewProviderAdapter.java
@@ -16,11 +16,11 @@
package androidx.webkit.internal;
+import androidx.webkit.WebViewCompat;
+
import org.chromium.support_lib_boundary.WebViewProviderBoundaryInterface;
import org.chromium.support_lib_boundary.util.BoundaryInterfaceReflectionUtil;
-import androidx.webkit.WebViewCompat;
-
/**
* Adapter for WebViewProviderBoundaryInterface providing the functionality expected of
* WebViewCompat, this adapter is the support library version of