[Android] Remove PageController Tests

This CL removes all PageController tests, however, subsequent
work to refactor tests to further remove/refactor dependencies
on rules and/or utils is left out of scope.

Bug: 1141179, 1130617
Change-Id: Ib858e22c53cf04743ab2c38de2b84742057bb9a7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4611811
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: James Lee <ljjlee@google.com>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
Commit-Queue: Fred Mello <fredmello@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1158902}

chrome/android/BUILD.gn

@@ -3606,11 +3606,8 @@ chrome_common_shared_library("libchromefortest") {
   java_targets = [
     "//chrome/android:chrome_public_unit_test_apk__test_apk",
     "//chrome/android:chrome_public_test_apk__test_apk",
-    "//chrome/test/android:chrome_java_test_pagecontroller_tests__test_apk",
     "//chrome/test/android:chrome_java_test_wpr_tests__test_apk",
     "//chrome/test/android:chrome_java_test_feed_test__test_apk",
-    "//chrome/test/android:chrome_webapk_integration_tests__test_apk",
-    "//chrome/test/android:chrome_java_test_pagecontroller_codelab__test_apk",
   ]
   if (enable_vr) {
     java_targets += [ "//chrome/android:chrome_public_test_vr_apk__test_apk" ]

chrome/android/javatests/src/org/chromium/chrome/test/smoke/ChromeBundleSmokeTest.java

@@ -50,7 +50,7 @@ public void setUp() {
                 ChromeUiApplicationTestRule.PACKAGE_NAME_ARG);
         Assert.assertNotNull("Must specify bundle under test", mPackageName);
         try {
-            mChromeUiRule.launchIntoNewTabPageOnFirstRun();
+            UiAutomatorUtils.getInstance().launchApplication(mPackageName);
         } catch (Exception e) {
             if (NonInstrumentedCrashDetector.checkDidChromeCrash()) {
                 throw new RuntimeException(mPackageName + " should not have crashed.");

chrome/browser/supervised_user/BUILD.gn

@@ -157,7 +157,7 @@ if (is_android) {
       "//chrome/browser/supervised_user:supervised_user_metrics_java",
       "//chrome/browser/supervised_user:website_parent_approval_java",
       "//chrome/test/android:chrome_java_integration_test_support",
-      "//chrome/test/android:chrome_java_test_pagecontroller",
+      "//chrome/test/android:pagecontroller_utils_java",
       "//components/browser_ui/bottomsheet/android:java",
       "//components/browser_ui/bottomsheet/android/test:java",
       "//components/signin/public/android:java",

chrome/test/android/BUILD.gn

@@ -37,57 +37,20 @@ android_library("chrome_java_test_pagecontroller") {
   testonly = true
   resources_package = "org.chromium.chrome"
   sources = [
-    "javatests/src/org/chromium/chrome/test/pagecontroller/controllers/ElementController.java",
-    "javatests/src/org/chromium/chrome/test/pagecontroller/controllers/PageController.java",
-    "javatests/src/org/chromium/chrome/test/pagecontroller/controllers/android/PermissionDialog.java",
-    "javatests/src/org/chromium/chrome/test/pagecontroller/controllers/first_run/SyncConfirmationViewPageController.java",
-    "javatests/src/org/chromium/chrome/test/pagecontroller/controllers/notifications/DownloadNotificationController.java",
-    "javatests/src/org/chromium/chrome/test/pagecontroller/controllers/ntp/ChromeMenu.java",
-    "javatests/src/org/chromium/chrome/test/pagecontroller/controllers/ntp/IncognitoNewTabPageController.java",
-    "javatests/src/org/chromium/chrome/test/pagecontroller/controllers/ntp/NewTabPageController.java",
-    "javatests/src/org/chromium/chrome/test/pagecontroller/controllers/ntp/SuggestionTileController.java",
-    "javatests/src/org/chromium/chrome/test/pagecontroller/controllers/tabswitcher/TabSwitcherController.java",
-    "javatests/src/org/chromium/chrome/test/pagecontroller/controllers/tabswitcher/TabSwitcherMenuController.java",
-    "javatests/src/org/chromium/chrome/test/pagecontroller/controllers/urlpage/UrlPage.java",
-    "javatests/src/org/chromium/chrome/test/pagecontroller/controllers/webapk/first_run/LightWeightTOSController.java",
     "javatests/src/org/chromium/chrome/test/pagecontroller/rules/ChromeUiApplicationTestRule.java",
     "javatests/src/org/chromium/chrome/test/pagecontroller/rules/ChromeUiAutomatorTestRule.java",
   ]
   deps = [
-    ":chrome_java_integration_test_support",
     "//base:base_java",
-    "//base:base_java_test_support",
     "//chrome/android:chrome_app_java_resources",
     "//chrome/android:chrome_java",
-    "//chrome/android/feed:chrome_feed_java_resources",
-    "//chrome/browser/ui/android/appmenu/test:test_support_java",
-    "//third_party/android_deps:guava_android_java",
-    "//third_party/androidx:androidx_annotation_annotation_java",
     "//third_party/androidx:androidx_test_core_java",
     "//third_party/androidx:androidx_test_monitor_java",
-    "//third_party/androidx:androidx_test_uiautomator_uiautomator_java",
     "//third_party/junit",
   ]
   public_deps = [ ":pagecontroller_utils_java" ]
 }
 
-chrome_public_test_apk_tmpl("chrome_java_test_pagecontroller_tests") {
-  apk_name = "ChromePageControllerTests"
-  sources = [
-    "javatests/src/org/chromium/chrome/test/pagecontroller/tests/ExampleTest.java",
-    "javatests/src/org/chromium/chrome/test/pagecontroller/tests/NewTabPageControllerTest.java",
-    "javatests/src/org/chromium/chrome/test/pagecontroller/tests/TabSwitcherControllerTest.java",
-  ]
-  deps = [
-    ":chrome_java_test_pagecontroller",
-    "//base:base_java_test_support",
-    "//chrome/browser/flags:java",
-    "//content/public/test/android:content_java_test_support",
-    "//third_party/hamcrest:hamcrest_java",
-    "//third_party/junit",
-  ]
-}
-
 generate_jni_registration("baseline_profile_test_apk_dummy_jni_registration") {
   testonly = true
   java_targets = [ ":baseline_profile_test_apk" ]
@@ -202,44 +165,6 @@ chrome_public_test_apk_tmpl("chrome_java_test_feed_test") {
   ]
 }
 
-# WebAPK tests which require additional_apks should be in this test suite.
-chrome_public_test_apk_tmpl("chrome_webapk_integration_tests") {
-  apk_name = "ChromeWebApkIntegrationTests"
-  sources = [ "javatests/src/org/chromium/chrome/test/pagecontroller/tests/webapk/MapsGoFirstRunTest.java" ]
-  deps = [
-    ":chrome_java_test_pagecontroller",
-    "//base:base_java",
-    "//base:base_java_test_support",
-    "//chrome/android:chrome_java",
-    "//chrome/android/webapk/libs/client:client_java",
-    "//chrome/android/webapk/libs/runtime_library:runtime_library_javatests",
-    "//chrome/android/webapk/shell_apk:shell_apk_javatests",
-    "//chrome/browser/first_run/android:java",
-    "//components/webapk/android/libs/client:java",
-    "//content/public/test/android:content_java_test_support",
-    "//third_party/androidx:androidx_test_core_java",
-    "//third_party/androidx:androidx_test_monitor_java",
-    "//third_party/junit",
-  ]
-
-  additional_apks = [
-    "//chrome/android/webapk/libs/runtime_library/javatests/apk_with_webapk_service:apk_with_webapk_service",
-    "//chrome/android/webapk/shell_apk/javatests/dex_optimizer:dex_optimizer_apk",
-    "//chrome/android/webapk/shell_apk:javatests_webapk",
-    "//chrome/android/webapk/shell_apk:uiautomator_maps_go_webapk",
-  ]
-}
-
-chrome_public_test_apk_tmpl("chrome_java_test_pagecontroller_codelab") {
-  apk_name = "ChromePageControllerCodelab"
-  sources = [ "javatests/src/org/chromium/chrome/test/pagecontroller/tests/codelab/SettingsForCodelabTest.java" ]
-  deps = [
-    ":chrome_java_test_pagecontroller",
-    "//base:base_java_test_support",
-    "//third_party/junit",
-  ]
-}
-
 robolectric_binary("chrome_java_test_pagecontroller_junit_tests") {
   testonly = true
   sources = [