Move IncognitoTabModelImpl to chrome/browser/tabmodel.

Bug: 1109013
Change-Id: I20b526652fb2a9134a472b885d49613d4acf2b33
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2511729
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828919}

chrome/android/BUILD.gn

@@ -2555,6 +2555,7 @@ chrome_test_apk_tmpl("chrome_public_test_apk") {
     "//chrome/browser/flags:javatests",
     "//chrome/browser/password_check/android:test_java",
     "//chrome/browser/subresource_filter:subresource_filter_javatests",
+    "//chrome/browser/tabmodel:javatests",
     "//chrome/browser/touch_to_fill/android:test_java",
     "//chrome/browser/ui/android/appmenu/internal:javatests",
     "//chrome/browser/ui/messages/android:javatests",

chrome/android/chrome_java_sources.gni

@@ -1405,7 +1405,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java",
   "java/src/org/chromium/chrome/browser/tabbed_mode/TabbedSystemUiCoordinator.java",
   "java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java",
-  "java/src/org/chromium/chrome/browser/tabmodel/IncognitoTabModelImpl.java",
   "java/src/org/chromium/chrome/browser/tabmodel/IncognitoTabModelImplCreator.java",
   "java/src/org/chromium/chrome/browser/tabmodel/TabModelDelegate.java",
   "java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java",

chrome/android/chrome_test_java_sources.gni

@@ -565,7 +565,6 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/tabmodel/AsyncTabCreationParamsManagerTest.java",
   "javatests/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreatorTest.java",
   "javatests/src/org/chromium/chrome/browser/tabmodel/ContextMenuLoadUrlParamsTest.java",
-  "javatests/src/org/chromium/chrome/browser/tabmodel/IncognitoTabModelTest.java",
   "javatests/src/org/chromium/chrome/browser/tabmodel/MultiInstanceMigrationTest.java",
   "javatests/src/org/chromium/chrome/browser/tabmodel/RestoreMigrateTest.java",
   "javatests/src/org/chromium/chrome/browser/tabmodel/TabModelImplTest.java",

chrome/android/java/src/org/chromium/chrome/browser/tabmodel/IncognitoTabModelImplCreator.java

@@ -51,7 +51,7 @@ class IncognitoTabModelImplCreator implements IncognitoTabModelDelegate {
      * @param asyncTabParamsManager An {@link AsyncTabParamsManager} instance.
      * @param modelDelegate       Delegate to handle external dependencies and interactions.
      */
-    public IncognitoTabModelImplCreator(@Nullable Supplier<WindowAndroid> windowAndroidSupplier,
+    IncognitoTabModelImplCreator(@Nullable Supplier<WindowAndroid> windowAndroidSupplier,
             TabCreator regularTabCreator, TabCreator incognitoTabCreator,
             TabModelOrderController orderController, TabContentManager tabContentManager,
             TabPersistentStore tabSaver, NextTabPolicySupplier nextTabPolicySupplier,

chrome/browser/tabmodel/BUILD.gn

@@ -18,6 +18,7 @@ android_library("java") {
     "android/java/src/org/chromium/chrome/browser/tabmodel/IncognitoTabHost.java",
     "android/java/src/org/chromium/chrome/browser/tabmodel/IncognitoTabHostRegistry.java",
     "android/java/src/org/chromium/chrome/browser/tabmodel/IncognitoTabModel.java",
+    "android/java/src/org/chromium/chrome/browser/tabmodel/IncognitoTabModelImpl.java",
     "android/java/src/org/chromium/chrome/browser/tabmodel/IncognitoTabModelObserver.java",
     "android/java/src/org/chromium/chrome/browser/tabmodel/NextTabPolicy.java",
     "android/java/src/org/chromium/chrome/browser/tabmodel/TabCreator.java",
@@ -58,3 +59,21 @@ android_library_factory("factory_java") {
     "internal/android/java/src/org/chromium/chrome/browser/tabmodel/TabWindowManagerFactory.java",
   ]
 }
+
+android_library("javatests") {
+  testonly = true
+  sources = [ "android/java/src/org/chromium/chrome/browser/tabmodel/IncognitoTabModelTest.java" ]
+  deps = [
+    ":java",
+    "//base:base_java_test_support",
+    "//chrome/android:chrome_java",
+    "//chrome/browser/flags:java",
+    "//chrome/browser/tab:java",
+    "//chrome/test/android:chrome_java_test_support",
+    "//content/public/android:content_java",
+    "//content/public/test/android:content_java_test_support",
+    "//third_party/android_deps:androidx_test_runner_java",
+    "//third_party/junit",
+    "//third_party/mockito:mockito_java",
+  ]
+}

chrome/android/java/src/org/chromium/chrome/browser/tabmodel/IncognitoTabModelImpl.java → chrome/browser/tabmodel/android/java/src/org/chromium/chrome/browser/tabmodel/IncognitoTabModelImpl.java

@@ -26,12 +26,11 @@ import java.util.List;
  * no Tabs remain, the native model will be destroyed and only rebuilt when a new incognito Tab
  * is created.
  */
-public class IncognitoTabModelImpl implements IncognitoTabModel {
+class IncognitoTabModelImpl implements IncognitoTabModel {
     /** Creates TabModels for use in IncognitoModel. */
     public interface IncognitoTabModelDelegate {
         /** Creates a fully working TabModel to delegate calls to. */
         TabModel createTabModel();
-
     }
 
     private final IncognitoTabModelDelegate mDelegate;
@@ -45,7 +44,7 @@ public class IncognitoTabModelImpl implements IncognitoTabModel {
     /**
      * Constructor for IncognitoTabModel.
      */
-    public IncognitoTabModelImpl(IncognitoTabModelDelegate tabModelCreator) {
+    IncognitoTabModelImpl(IncognitoTabModelDelegate tabModelCreator) {
         mDelegate = tabModelCreator;
         mDelegateModel = EmptyTabModel.getInstance();
     }