Update weblayer to androidx.

Should not affect api calls after this has landed.
https://critique.corp.google.com/#review/304996839


Bug: 1067296
Change-Id: Ic95d4bc923784592d58d6eb4b0af4aca45d52a43
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2136697Reviewed-by: Tobias Sargeant <tobiasjs@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Commit-Queue: benjamin joyce <bjoyce@chromium.org>
Cr-Commit-Position: refs/heads/master@{#757077}

testing/android/native_test/java/src/org/chromium/native_test/NativeBrowserTestActivity.java

@@ -5,7 +5,8 @@
 package org.chromium.native_test;
 
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
+
+import androidx.fragment.app.FragmentActivity;
 
 import java.io.File;
 

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/BrowserFragmentLifecycleTest.java

@@ -7,9 +7,9 @@ package org.chromium.weblayer.test;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.test.filters.SmallTest;
-import android.support.v4.app.FragmentManager;
 
 import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentManager;
 
 import org.junit.Assert;
 import org.junit.Rule;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/CookieManagerTest.java

@@ -6,7 +6,8 @@ package org.chromium.weblayer.test;
 
 import android.net.Uri;
 import android.support.test.filters.SmallTest;
-import android.support.v4.app.FragmentManager;
+
+import androidx.fragment.app.FragmentManager;
 
 import org.junit.Assert;
 import org.junit.Before;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/DataClearingTest.java

@@ -9,7 +9,8 @@ import static org.chromium.weblayer.BrowsingDataType.CACHE;
 import static org.chromium.weblayer.BrowsingDataType.COOKIES_AND_SITE_DATA;
 
 import android.support.test.filters.SmallTest;
-import android.support.v4.app.FragmentManager;
+
+import androidx.fragment.app.FragmentManager;
 
 import org.junit.Rule;
 import org.junit.Test;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/ExternalNavigationTest.java

@@ -8,7 +8,8 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.test.filters.SmallTest;
-import android.support.v4.app.Fragment;
+
+import androidx.fragment.app.Fragment;
 
 import org.junit.Assert;
 import org.junit.Rule;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/InputTypesTest.java

@@ -17,9 +17,9 @@ import android.os.Handler;
 import android.os.Parcelable;
 import android.provider.MediaStore;
 import android.support.test.filters.SmallTest;
-import android.support.v4.app.Fragment;
 
 import androidx.core.app.ActivityCompat;
+import androidx.fragment.app.Fragment;
 
 import org.junit.After;
 import org.junit.Assert;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/InstrumentationActivityTestRule.java

@@ -12,9 +12,10 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.rule.ActivityTestRule;
-import android.support.v4.app.Fragment;
 import android.text.TextUtils;
 
+import androidx.fragment.app.Fragment;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Assert;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/SmokeTest.java

@@ -5,7 +5,8 @@
 package org.chromium.weblayer.test;
 
 import android.support.test.filters.SmallTest;
-import android.support.v4.app.Fragment;
+
+import androidx.fragment.app.Fragment;
 
 import org.junit.Assert;
 import org.junit.Rule;

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/TopControlsTest.java

@@ -6,10 +6,11 @@ package org.chromium.weblayer.test;
 
 import android.os.Build;
 import android.support.test.filters.SmallTest;
-import android.support.v4.app.Fragment;
 import android.view.View;
 import android.widget.FrameLayout;
 
+import androidx.fragment.app.Fragment;
+
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;

weblayer/public/java/org/chromium/weblayer/Browser.java

@@ -5,12 +5,12 @@
 package org.chromium.weblayer;
 
 import android.os.RemoteException;
-import android.support.v4.app.Fragment;
 import android.view.View;
 import android.webkit.ValueCallback;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 
 import org.chromium.weblayer_private.interfaces.APICallException;
 import org.chromium.weblayer_private.interfaces.IBrowser;

weblayer/public/java/org/chromium/weblayer/BrowserFragment.java

@@ -11,12 +11,12 @@ import android.content.IntentSender;
 import android.content.IntentSender.SendIntentException;
 import android.os.Bundle;
 import android.os.RemoteException;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
 
 import org.chromium.weblayer_private.interfaces.APICallException;
 import org.chromium.weblayer_private.interfaces.IBrowserFragment;

weblayer/public/java/org/chromium/weblayer/WebLayer.java

@@ -12,7 +12,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.RemoteException;
-import android.support.v4.app.Fragment;
 import android.util.AndroidRuntimeException;
 import android.util.Log;
 import android.util.Pair;
@@ -20,6 +19,7 @@ import android.webkit.ValueCallback;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 
 import org.chromium.weblayer_private.interfaces.APICallException;
 import org.chromium.weblayer_private.interfaces.BrowserFragmentArgs;

weblayer/public/java/org/chromium/weblayer/WebLayerFileProvider.java

@@ -4,7 +4,7 @@
 
 package org.chromium.weblayer;
 
-import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
 
 /**
  * Subclass of FileProvider which prevents conflicts with the embedding application manifest.

weblayer/shell/android/browsertests_apk/src/org/chromium/weblayer_browsertests_apk/WebLayerBrowserTestsActivity.java

@@ -5,14 +5,15 @@
 package org.chromium.weblayer_browsertests_apk;
 
 import android.net.Uri;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
 import android.view.View;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.content_public.browser.BrowserStartupController;
 import org.chromium.native_test.NativeBrowserTest;

weblayer/shell/android/shell_apk/src/org/chromium/weblayer/shell/InstrumentationActivity.java

@@ -11,10 +11,6 @@ import android.os.Bundle;
 import android.os.StrictMode;
 import android.os.StrictMode.ThreadPolicy;
 import android.os.StrictMode.VmPolicy;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
 import android.text.InputType;
 import android.view.View;
 import android.view.ViewGroup;
@@ -24,6 +20,11 @@ import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
 import org.chromium.base.ContextUtils;
 import org.chromium.weblayer.Browser;
 import org.chromium.weblayer.NewTabCallback;

weblayer/shell/android/shell_apk/src/org/chromium/weblayer/shell/TelemetryActivity.java

@@ -6,10 +6,6 @@ package org.chromium.weblayer.shell;
 
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
 import android.text.InputType;
 import android.view.View;
 import android.view.ViewGroup;
@@ -19,6 +15,11 @@ import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
 import org.chromium.weblayer.Browser;
 import org.chromium.weblayer.Profile;
 import org.chromium.weblayer.Tab;

weblayer/shell/android/shell_apk/src/org/chromium/weblayer/shell/WebLayerShellActivity.java

@@ -10,10 +10,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
 import android.text.TextUtils;
 import android.view.ContextMenu;
 import android.view.KeyEvent;
@@ -32,6 +28,11 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.ViewSwitcher;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
 import org.chromium.weblayer.Browser;
 import org.chromium.weblayer.ContextMenuParams;
 import org.chromium.weblayer.DownloadCallback;