[Signin][Modularization] Move confirm sync dialog tests to signin.ui module

This CL moves two confirm sync dialog tests to the junit target of
c.b.signin.ui module.

Bug: 1156585, 1156588
Change-Id: I3f54d90707a20ab22671d3f20e8ef1146c784cd0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2584977Reviewed-by: David Trainor <dtrainor@chromium.org>
Commit-Queue: Alice Wang <aliceywang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#836556}

chrome/android/chrome_junit_test_java_sources.gni

@@ -203,8 +203,6 @@ chrome_junit_test_java_sources = [
   "junit/src/org/chromium/chrome/browser/search_engines/settings/SearchEngineAdapterTest.java",
   "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/ConfirmImportSyncDataDialogTest.java",
-  "junit/src/org/chromium/chrome/browser/signin/ConfirmManagedSyncDataDialogTest.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",

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

@@ -60,10 +60,16 @@ android_resources("java_resources") {
 android_library("junit") {
   bypass_platform_checks = true
   testonly = true
-  sources = [ "junit/src/org/chromium/chrome/browser/signin/ui/ConfirmSyncDataStateMachineDelegateTest.java" ]
+  sources = [
+    "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",
+  ]
   deps = [
     ":java",
     "//base:base_junit_test_support",
+    "//chrome/browser/profiles/android:java",
+    "//chrome/browser/signin/services/android: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/junit/src/org/chromium/chrome/browser/signin/ConfirmImportSyncDataDialogTest.java → chrome/browser/signin/ui/android/junit/src/org/chromium/chrome/browser/signin/ui/ConfirmImportSyncDataDialogTest.java

 // Copyright 2019 The Chromium Authors. All rights reserved.
 // 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.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
@@ -24,17 +25,12 @@ import org.robolectric.shadows.ShadowAlertDialog;
 import org.robolectric.shadows.ShadowToast;
 
 import org.chromium.base.test.BaseRobolectricTestRunner;
-import org.chromium.chrome.R;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
 import org.chromium.chrome.browser.signin.services.SigninManager;
-import org.chromium.chrome.browser.signin.ui.ConfirmImportSyncDataDialog;
-import org.chromium.chrome.browser.signin.ui.ConfirmSyncDataStateMachineDelegate;
 
 /**
  * Tests for {@link ConfirmImportSyncDataDialog}.
- * TODO(https://crbug.com/1156585): Modularize this class after moving the
- * {@link ConfirmSyncDataStateMachineDelegate}.
  */
 @RunWith(BaseRobolectricTestRunner.class)
 public class ConfirmImportSyncDataDialogTest {

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

 // Copyright 2019 The Chromium Authors. All rights reserved.
 // 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.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -22,14 +23,9 @@ import org.robolectric.Robolectric;
 import org.robolectric.shadows.ShadowAlertDialog;
 
 import org.chromium.base.test.BaseRobolectricTestRunner;
-import org.chromium.chrome.R;
-import org.chromium.chrome.browser.signin.ui.ConfirmManagedSyncDataDialog;
-import org.chromium.chrome.browser.signin.ui.ConfirmSyncDataStateMachineDelegate;
 
 /**
  * Tests for {@link ConfirmManagedSyncDataDialog}.
- * TODO(https://crbug.com/1156588): Modularize this class after moving the
- * {@link ConfirmSyncDataStateMachineDelegate}.
  */
 @RunWith(BaseRobolectricTestRunner.class)
 public class ConfirmManagedSyncDataDialogTest {