[Signin][Modularization] Move SignOutDialogFragment to signin.ui target

This CL moves SignOutDialogFragment and its unit tests to signin.ui
target.

Bug: 1157415
Change-Id: I86739c298e39a660be757ec22bb82d0d950144bd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2587163Reviewed-by: David Trainor <dtrainor@chromium.org>
Commit-Queue: Alice Wang <aliceywang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#837010}

chrome/android/chrome_java_resources.gni

@@ -932,7 +932,6 @@ chrome_java_resources = [
   "java/res/layout/sharing_device_picker.xml",
   "java/res/layout/sheet_tab_toolbar.xml",
   "java/res/layout/signin_activity.xml",
-  "java/res/layout/signout_wipe_storage_dialog.xml",
   "java/res/layout/start_top_toolbar.xml",
   "java/res/layout/status_indicator_container.xml",
   "java/res/layout/suggestions_site_tile_grid_modern.xml",

chrome/android/chrome_java_sources.gni

@@ -1242,7 +1242,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardMetrics.java",
   "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardShareActivity.java",
   "java/src/org/chromium/chrome/browser/signin/AccountPickerDialogFragment.java",
-  "java/src/org/chromium/chrome/browser/signin/SignOutDialogFragment.java",
   "java/src/org/chromium/chrome/browser/signin/SigninActivity.java",
   "java/src/org/chromium/chrome/browser/signin/SigninActivityLauncherImpl.java",
   "java/src/org/chromium/chrome/browser/signin/SigninFragment.java",

chrome/android/chrome_junit_test_java_sources.gni

@@ -204,7 +204,6 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/send_tab_to_self/SendTabToSelfShareActivityTest.java",
   "junit/src/org/chromium/chrome/browser/sharing/click_to_call/ClickToCallMessageHandlerTest.java",
   "junit/src/org/chromium/chrome/browser/signin/ConfirmSyncDataStateMachineTest.java",
-  "junit/src/org/chromium/chrome/browser/signin/SignOutDialogFragmentTest.java",
   "junit/src/org/chromium/chrome/browser/signin/SigninManagerTest.java",
   "junit/src/org/chromium/chrome/browser/signin/SigninPromoUtilTest.java",
   "junit/src/org/chromium/chrome/browser/signin/SigninUtilsAccountPickerTest.java",

chrome/android/java/src/PRESUBMIT.py

@@ -95,7 +95,7 @@ def _CheckAlertDialogBuilder(input_api, output_api):
       SIGNIN_UI_BROWSER_ROOT + 'ConfirmManagedSyncDataDialog.java',
       SIGNIN_UI_BROWSER_ROOT + 'ConfirmSyncDataStateMachineDelegate.java',
       BROWSER_ROOT + 'signin/SigninFragmentBase.java',
-      BROWSER_ROOT + 'signin/SignOutDialogFragment.java',
+      SIGNIN_UI_BROWSER_ROOT + 'SignOutDialogFragment.java',
       BROWSER_ROOT + 'site_settings/AddExceptionPreference.java',
       BROWSER_ROOT + 'site_settings/ChosenObjectSettings.java',
       BROWSER_ROOT + 'site_settings/ManageSpaceActivity.java',

chrome/android/java/src/org/chromium/chrome/browser/sync/settings/AccountManagementFragment.java

@@ -32,14 +32,14 @@ import org.chromium.chrome.browser.profiles.ProfileAccountManagementMetrics;
 import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
 import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
-import org.chromium.chrome.browser.signin.SignOutDialogFragment;
-import org.chromium.chrome.browser.signin.SignOutDialogFragment.SignOutDialogListener;
 import org.chromium.chrome.browser.signin.SigninUtils;
 import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
 import org.chromium.chrome.browser.signin.services.ProfileDataCache;
 import org.chromium.chrome.browser.signin.services.SigninManager;
 import org.chromium.chrome.browser.signin.services.SigninManager.SignInStateObserver;
 import org.chromium.chrome.browser.signin.services.SigninMetricsUtils;
+import org.chromium.chrome.browser.signin.ui.SignOutDialogFragment;
+import org.chromium.chrome.browser.signin.ui.SignOutDialogFragment.SignOutDialogListener;
 import org.chromium.chrome.browser.superviseduser.FilteringBehavior;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
 import org.chromium.components.browser_ui.settings.ChromeBasePreference;

chrome/android/java/src/org/chromium/chrome/browser/sync/settings/GoogleServicesSettings.java

@@ -31,10 +31,10 @@ import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImp
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.safe_browsing.SafeBrowsingBridge;
 import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate;
-import org.chromium.chrome.browser.signin.SignOutDialogFragment;
 import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
 import org.chromium.chrome.browser.signin.services.SigninManager;
 import org.chromium.chrome.browser.signin.services.UnifiedConsentServiceBridge;
+import org.chromium.chrome.browser.signin.ui.SignOutDialogFragment;
 import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
 import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate;
 import org.chromium.components.browser_ui.settings.SettingsUtils;

chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java

@@ -46,11 +46,11 @@ import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.profiles.ProfileAccountManagementMetrics;
 import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate;
 import org.chromium.chrome.browser.settings.SettingsActivity;
-import org.chromium.chrome.browser.signin.SignOutDialogFragment;
 import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
 import org.chromium.chrome.browser.signin.services.SigninManager;
 import org.chromium.chrome.browser.signin.services.SigninMetricsUtils;
 import org.chromium.chrome.browser.signin.services.UnifiedConsentServiceBridge;
+import org.chromium.chrome.browser.signin.ui.SignOutDialogFragment;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
 import org.chromium.chrome.browser.sync.TrustedVaultClient;
 import org.chromium.chrome.browser.sync.settings.SyncSettingsUtils.SyncError;

chrome/android/javatests/src/org/chromium/chrome/browser/signin/SignOutDialogRenderTest.java

@@ -35,6 +35,7 @@ import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
 import org.chromium.chrome.browser.signin.services.SigninManager;
 import org.chromium.chrome.browser.signin.services.SigninMetricsUtils;
 import org.chromium.chrome.browser.signin.services.SigninMetricsUtilsJni;
+import org.chromium.chrome.browser.signin.ui.SignOutDialogFragment;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.util.ChromeRenderTestRule;
 import org.chromium.components.signin.GAIAServiceType;

chrome/browser/signin/ui/android/BUILD.gn

@@ -15,6 +15,7 @@ android_library("java") {
     "//components/browser_ui/settings/android:java",
     "//components/browser_ui/widget/android:java",
     "//components/embedder_support/android:util_java",
+    "//components/signin/core/browser:signin_enums_java",
     "//components/signin/public/android:java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_appcompat_appcompat_java",
@@ -31,6 +32,7 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/signin/ui/ConsentTextTracker.java",
     "java/src/org/chromium/chrome/browser/signin/ui/GoogleActivityController.java",
     "java/src/org/chromium/chrome/browser/signin/ui/PersonalizedSigninPromoView.java",
+    "java/src/org/chromium/chrome/browser/signin/ui/SignOutDialogFragment.java",
     "java/src/org/chromium/chrome/browser/signin/ui/SigninActivityLauncher.java",
     "java/src/org/chromium/chrome/browser/signin/ui/SigninScrollView.java",
     "java/src/org/chromium/chrome/browser/signin/ui/SigninView.java",
@@ -50,6 +52,7 @@ android_resources("java_resources") {
     "java/res/layout/personalized_signin_promo_view_settings.xml",
     "java/res/layout/signin_progress_bar_dialog.xml",
     "java/res/layout/signin_view.xml",
+    "java/res/layout/signout_wipe_storage_dialog.xml",
   ]
   deps = [
     "//chrome/browser/ui/android/strings:ui_strings_grd",
@@ -66,12 +69,15 @@ android_library("junit") {
     "junit/src/org/chromium/chrome/browser/signin/ui/ConfirmImportSyncDataDialogTest.java",
     "junit/src/org/chromium/chrome/browser/signin/ui/ConfirmManagedSyncDataDialogTest.java",
     "junit/src/org/chromium/chrome/browser/signin/ui/ConfirmSyncDataStateMachineDelegateTest.java",
+    "junit/src/org/chromium/chrome/browser/signin/ui/SignOutDialogFragmentTest.java",
   ]
   deps = [
     ":java",
+    "//base:base_java_test_support",
     "//base:base_junit_test_support",
     "//chrome/browser/profiles/android:java",
     "//chrome/browser/signin/services/android:java",
+    "//components/signin/core/browser:signin_enums_java",
     "//third_party/android_deps:androidx_appcompat_appcompat_java",
     "//third_party/android_deps:androidx_fragment_fragment_java",
     "//third_party/android_deps:robolectric_all_java",

chrome/android/java/src/org/chromium/chrome/browser/signin/SignOutDialogFragment.java → chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/SignOutDialogFragment.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.signin;
+package org.chromium.chrome.browser.signin.ui;
 
 import android.app.Dialog;
 import android.content.DialogInterface;
@@ -16,7 +16,6 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 
 import org.chromium.base.metrics.RecordHistogram;
-import org.chromium.chrome.R;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.profiles.ProfileAccountManagementMetrics;
 import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
@@ -28,8 +27,8 @@ import org.chromium.components.signin.GAIAServiceType;
  * Shows the dialog that explains the user the consequences of signing out of Chrome.
  * Calls the listener callback if the user signs out.
  */
-public class SignOutDialogFragment extends DialogFragment implements
-        DialogInterface.OnClickListener {
+public class SignOutDialogFragment
+        extends DialogFragment implements DialogInterface.OnClickListener {
     /**
      * The extra key used to specify the GAIA service that triggered this dialog.
      */
@@ -65,8 +64,8 @@ public class SignOutDialogFragment extends DialogFragment implements
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         if (getArguments() != null) {
-            mGaiaServiceType = getArguments().getInt(
-                    SHOW_GAIA_SERVICE_TYPE_EXTRA, mGaiaServiceType);
+            mGaiaServiceType =
+                    getArguments().getInt(SHOW_GAIA_SERVICE_TYPE_EXTRA, mGaiaServiceType);
         }
         String domain = IdentityServicesProvider.get()
                                 .getSigninManager(Profile.getLastUsedRegularProfile())

chrome/android/junit/src/org/chromium/chrome/browser/signin/SignOutDialogFragmentTest.java → chrome/browser/signin/ui/android/junit/src/org/chromium/chrome/browser/signin/ui/SignOutDialogFragmentTest.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.signin;
+package org.chromium.chrome.browser.signin.ui;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
@@ -31,7 +31,6 @@ import org.robolectric.shadows.ShadowAlertDialog;
 
 import org.chromium.base.test.BaseRobolectricTestRunner;
 import org.chromium.base.test.util.JniMocker;
-import org.chromium.chrome.R;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.profiles.ProfileAccountManagementMetrics;
 import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
@@ -51,7 +50,6 @@ public class SignOutDialogFragmentTest {
         public void onSignOutClicked(boolean forceWipeUserData) {}
     }
 
-
     @Rule
     public final JniMocker mocker = new JniMocker();