Remove observer from TabPersistentStore's constructor

This is a step to detach TabPersistentStore from TabModelSelectorImpl.

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

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

@@ -88,8 +88,8 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod
         };
         mIsUndoSupported = supportUndo;
         mIsTabbedActivityForSync = isTabbedActivity;
-        mTabSaver = new TabPersistentStore(
-                persistencePolicy, this, tabCreatorManager, persistentStoreObserver);
+        mTabSaver = new TabPersistentStore(persistencePolicy, this, tabCreatorManager);
+        mTabSaver.addObserver(persistentStoreObserver);
         mOrderController = new TabModelOrderControllerImpl(this);
         mNextTabPolicySupplier = nextTabPolicySupplier;
         mAsyncTabParamsManager = asyncTabParamsManager;

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

@@ -197,10 +197,9 @@ public class TabPersistentStore extends TabPersister {
      * Creates an instance of a TabPersistentStore.
      * @param modelSelector The {@link TabModelSelector} to restore to and save from.
      * @param tabCreatorManager The {@link TabCreatorManager} to use.
-     * @param observer      Notified when the TabPersistentStore has completed tasks.
      */
     public TabPersistentStore(TabPersistencePolicy policy, TabModelSelector modelSelector,
-            TabCreatorManager tabCreatorManager, TabPersistentStoreObserver observer) {
+            TabCreatorManager tabCreatorManager) {
         mPersistencePolicy = policy;
         mTabModelSelector = modelSelector;
         mTabCreatorManager = tabCreatorManager;
@@ -208,7 +207,6 @@ public class TabPersistentStore extends TabPersister {
         mTabsToRestore = new ArrayDeque<>();
         mTabIdsToRestore = new HashSet<>();
         mObservers = new ObserverList<>();
-        mObservers.addObserver(observer);
         TaskTraits taskTraits = TaskTraits.USER_BLOCKING_MAY_BLOCK;
         mSequencedTaskRunner = PostTask.createSequencedTaskRunner(taskTraits);
         mPrefetchTabListToMergeTasks = new ArrayList<>();

chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/MultiInstanceMigrationTest.java

@@ -59,8 +59,7 @@ public class MultiInstanceMigrationTest {
             MockTabModelSelector selector = new MockTabModelSelector(0, 0, null);
             TabbedModeTabPersistencePolicy persistencePolicy =
                     new TabbedModeTabPersistencePolicy(0, false);
-            TabPersistentStore store =
-                    new TabPersistentStore(persistencePolicy, selector, null, null);
+            TabPersistentStore store = new TabPersistentStore(persistencePolicy, selector, null);
             store.waitForMigrationToFinish();
         });
     }

chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/RestoreMigrateTest.java

@@ -86,8 +86,8 @@ public class RestoreMigrateTest {
             public TabPersistentStore call() {
                 TabPersistencePolicy persistencePolicy = new TabbedModeTabPersistencePolicy(
                         selectorIndex, false);
-                TabPersistentStore store = new TabPersistentStore(
-                        persistencePolicy, selector, null, null);
+                TabPersistentStore store =
+                        new TabPersistentStore(persistencePolicy, selector, null);
                 return store;
             }
         });

chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorObserverTestRule.java

@@ -75,7 +75,7 @@ public class TabModelSelectorObserverTestRule extends ChromeBrowserTestRule {
         tabContentManager.initWithNative();
         TabPersistencePolicy persistencePolicy = new TabbedModeTabPersistencePolicy(0, false);
         TabPersistentStore tabPersistentStore =
-                new TabPersistentStore(persistencePolicy, mSelector, null, null);
+                new TabPersistentStore(persistencePolicy, mSelector, null);
         NextTabPolicySupplier nextTabPolicySupplier = () -> NextTabPolicy.HIERARCHICAL;
         AsyncTabParamsManager asyncTabParamsManager = AsyncTabParamsManagerSingleton.getInstance();
 

chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreTest.java

@@ -107,9 +107,11 @@ public class TabPersistentStoreTest {
                         public TabPersistentStore call() {
                             TabPersistencePolicy persistencePolicy =
                                     new TabbedModeTabPersistencePolicy(0, true);
-                            return new TabPersistentStore(persistencePolicy,
-                                    TestTabModelSelector.this, getTabCreatorManager(),
-                                    mTabPersistentStoreObserver);
+                            TabPersistentStore tabPersistentStore =
+                                    new TabPersistentStore(persistencePolicy,
+                                            TestTabModelSelector.this, getTabCreatorManager());
+                            tabPersistentStore.addObserver(mTabPersistentStoreObserver);
+                            return tabPersistentStore;
                         }
                     });
             mTabModelOrderController = new TabModelOrderControllerImpl(this);
@@ -272,13 +274,11 @@ public class TabPersistentStoreTest {
     }
 
     private TabPersistentStore buildTabPersistentStore(final TabPersistencePolicy persistencePolicy,
-            final TabModelSelector modelSelector, final TabCreatorManager creatorManager,
-            final TabPersistentStoreObserver observer) {
+            final TabModelSelector modelSelector, final TabCreatorManager creatorManager) {
         return TestThreadUtils.runOnUiThreadBlockingNoException(new Callable<TabPersistentStore>() {
             @Override
             public TabPersistentStore call() {
-                return new TabPersistentStore(persistencePolicy, modelSelector, creatorManager,
-                        observer);
+                return new TabPersistentStore(persistencePolicy, modelSelector, creatorManager);
             }
         });
     }
@@ -299,7 +299,8 @@ public class TabPersistentStoreTest {
         MockTabPersistentStoreObserver mockObserver = new MockTabPersistentStoreObserver();
         TabPersistencePolicy persistencePolicy = new TabbedModeTabPersistencePolicy(0, false);
         final TabPersistentStore store =
-                buildTabPersistentStore(persistencePolicy, mockSelector, mockManager, mockObserver);
+                buildTabPersistentStore(persistencePolicy, mockSelector, mockManager);
+        store.addObserver(mockObserver);
 
         // Should not prefetch with no prior active tab preference stored.
         Assert.assertNull(store.mPrefetchActiveTabTask);
@@ -348,8 +349,9 @@ public class TabPersistentStoreTest {
         MockTabCreatorManager firstManager = new MockTabCreatorManager(firstSelector);
         MockTabPersistentStoreObserver firstObserver = new MockTabPersistentStoreObserver();
         TabPersistencePolicy firstPersistencePolicy = new TabbedModeTabPersistencePolicy(0, false);
-        final TabPersistentStore firstStore = buildTabPersistentStore(
-                firstPersistencePolicy, firstSelector, firstManager, firstObserver);
+        final TabPersistentStore firstStore =
+                buildTabPersistentStore(firstPersistencePolicy, firstSelector, firstManager);
+        firstStore.addObserver(firstObserver);
         firstStore.loadState(false /* ignoreIncognitoFiles */);
         firstObserver.initializedCallback.waitForCallback(0, 1);
         Assert.assertEquals(numExpectedTabs, firstObserver.mTabCountAtStartup);
@@ -364,8 +366,9 @@ public class TabPersistentStoreTest {
         MockTabPersistentStoreObserver secondObserver = new MockTabPersistentStoreObserver();
         TabPersistencePolicy secondPersistencePolicy = new TabbedModeTabPersistencePolicy(0, false);
 
-        final TabPersistentStore secondStore = buildTabPersistentStore(
-                secondPersistencePolicy, secondSelector, secondManager, secondObserver);
+        final TabPersistentStore secondStore =
+                buildTabPersistentStore(secondPersistencePolicy, secondSelector, secondManager);
+        secondStore.addObserver(secondObserver);
 
         // The second TabPersistentStore reads the file written by the first TabPersistentStore.
         // Make sure that all of the Tabs appear in the new one -- even though the new file was
@@ -427,7 +430,8 @@ public class TabPersistentStoreTest {
         MockTabPersistentStoreObserver mockObserver = new MockTabPersistentStoreObserver();
         TabPersistencePolicy persistencePolicy = new TabbedModeTabPersistencePolicy(0, false);
         final TabPersistentStore store =
-                buildTabPersistentStore(persistencePolicy, mockSelector, mockManager, mockObserver);
+                buildTabPersistentStore(persistencePolicy, mockSelector, mockManager);
+        store.addObserver(mockObserver);
 
         // Make sure the metadata file loads properly and in order.
         store.loadState(false /* ignoreIncognitoFiles */);
@@ -474,7 +478,8 @@ public class TabPersistentStoreTest {
         MockTabPersistentStoreObserver mockObserver = new MockTabPersistentStoreObserver();
         TabPersistencePolicy persistencePolicy = new TabbedModeTabPersistencePolicy(0, false);
         final TabPersistentStore store =
-                buildTabPersistentStore(persistencePolicy, mockSelector, mockManager, mockObserver);
+                buildTabPersistentStore(persistencePolicy, mockSelector, mockManager);
+        store.addObserver(mockObserver);
 
         // Load the TabModel metadata.
         store.loadState(false /* ignoreIncognitoFiles */);
@@ -508,7 +513,8 @@ public class TabPersistentStoreTest {
         MockTabPersistentStoreObserver mockObserver = new MockTabPersistentStoreObserver();
         TabPersistencePolicy persistencePolicy = new TabbedModeTabPersistencePolicy(0, false);
         final TabPersistentStore store =
-                buildTabPersistentStore(persistencePolicy, mockSelector, mockManager, mockObserver);
+                buildTabPersistentStore(persistencePolicy, mockSelector, mockManager);
+        store.addObserver(mockObserver);
 
         // Without loading state, simulate three tabs pending restore, then save state to write
         // out to disk.
@@ -565,8 +571,9 @@ public class TabPersistentStoreTest {
         MockTabCreatorManager mockManager = new MockTabCreatorManager(mockSelector);
         MockTabPersistentStoreObserver mockObserver = new MockTabPersistentStoreObserver();
         TabPersistencePolicy persistencePolicy = new TabbedModeTabPersistencePolicy(0, false);
-        final TabPersistentStore store = buildTabPersistentStore(
-                persistencePolicy, mockSelector, mockManager, mockObserver);
+        final TabPersistentStore store =
+                buildTabPersistentStore(persistencePolicy, mockSelector, mockManager);
+        store.addObserver(mockObserver);
         store.waitForMigrationToFinish();
 
         Assert.assertNotNull(store.mPrefetchActiveTabTask);

chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreUnitTest.java

@@ -40,7 +40,6 @@ import org.chromium.chrome.browser.tab.TabImpl;
 import org.chromium.chrome.browser.tab.TabLaunchType;
 import org.chromium.chrome.browser.tab.TabState;
 import org.chromium.chrome.browser.tabmodel.TabPersistentStore.TabModelSelectorMetadata;
-import org.chromium.chrome.browser.tabmodel.TabPersistentStore.TabPersistentStoreObserver;
 import org.chromium.chrome.browser.tabmodel.TabPersistentStore.TabRestoreDetails;
 import org.chromium.components.embedder_support.util.UrlConstants;
 import org.chromium.content_public.browser.LoadUrlParams;
@@ -86,9 +85,6 @@ public class TabPersistentStoreUnitTest {
     @Mock
     private TabCreator mIncognitoTabCreator;
 
-    @Mock
-    private TabPersistentStoreObserver mObserver;
-
     private TabPersistentStore mPersistentStore;
 
     @Before
@@ -128,7 +124,7 @@ public class TabPersistentStoreUnitTest {
         when(mIncognitoTabModel.index()).thenReturn(TabList.INVALID_TAB_INDEX);
 
         mPersistentStore = new TabPersistentStore(
-                mPersistencePolicy, mTabModelSelector, mTabCreatorManager, mObserver) {
+                mPersistencePolicy, mTabModelSelector, mTabCreatorManager) {
             @Override
             protected void saveNextTab() {
                 // Intentionally ignore to avoid triggering async task creation.
@@ -176,8 +172,8 @@ public class TabPersistentStoreUnitTest {
     @SmallTest
     @Feature("TabPersistentStore")
     public void testNotActiveEmptyNtpIgnoredDuringRestore() {
-        mPersistentStore = new TabPersistentStore(
-                mPersistencePolicy, mTabModelSelector, mTabCreatorManager, mObserver);
+        mPersistentStore =
+                new TabPersistentStore(mPersistencePolicy, mTabModelSelector, mTabCreatorManager);
         mPersistentStore.initializeRestoreVars(false);
 
         TabRestoreDetails emptyNtpDetails =
@@ -194,8 +190,8 @@ public class TabPersistentStoreUnitTest {
         when(mTabModelSelector.isIncognitoSelected()).thenReturn(false);
         when(mTabModelSelector.getCurrentModel()).thenReturn(mNormalTabModel);
 
-        mPersistentStore = new TabPersistentStore(
-                mPersistencePolicy, mTabModelSelector, mTabCreatorManager, mObserver);
+        mPersistentStore =
+                new TabPersistentStore(mPersistencePolicy, mTabModelSelector, mTabCreatorManager);
         mPersistentStore.initializeRestoreVars(false);
 
         LoadUrlParamsUrlMatcher paramsMatcher = new LoadUrlParamsUrlMatcher(UrlConstants.NTP_URL);
@@ -220,8 +216,8 @@ public class TabPersistentStoreUnitTest {
         when(mTabModelSelector.isIncognitoSelected()).thenReturn(false);
         when(mTabModelSelector.getCurrentModel()).thenReturn(mNormalTabModel);
 
-        mPersistentStore = new TabPersistentStore(
-                mPersistencePolicy, mTabModelSelector, mTabCreatorManager, mObserver);
+        mPersistentStore =
+                new TabPersistentStore(mPersistencePolicy, mTabModelSelector, mTabCreatorManager);
         mPersistentStore.initializeRestoreVars(false);
 
         LoadUrlParamsUrlMatcher paramsMatcher = new LoadUrlParamsUrlMatcher(UrlConstants.NTP_URL);
@@ -250,8 +246,8 @@ public class TabPersistentStoreUnitTest {
     @Feature("TabPersistentStore")
     // TODO(crbug.com/1119583) Add similar test for CriticalPersistedTabData
     public void testNtpWithStateNotIgnoredDuringRestore() {
-        mPersistentStore = new TabPersistentStore(
-                mPersistencePolicy, mTabModelSelector, mTabCreatorManager, mObserver);
+        mPersistentStore =
+                new TabPersistentStore(mPersistencePolicy, mTabModelSelector, mTabCreatorManager);
         mPersistentStore.initializeRestoreVars(false);
 
         TabRestoreDetails ntpDetails =
@@ -269,8 +265,8 @@ public class TabPersistentStoreUnitTest {
         when(mTabModelSelector.isIncognitoSelected()).thenReturn(true);
         when(mTabModelSelector.getCurrentModel()).thenReturn(mIncognitoTabModel);
 
-        mPersistentStore = new TabPersistentStore(
-                mPersistencePolicy, mTabModelSelector, mTabCreatorManager, mObserver);
+        mPersistentStore =
+                new TabPersistentStore(mPersistencePolicy, mTabModelSelector, mTabCreatorManager);
         mPersistentStore.initializeRestoreVars(false);
 
         LoadUrlParamsUrlMatcher paramsMatcher = new LoadUrlParamsUrlMatcher(UrlConstants.NTP_URL);
@@ -292,8 +288,8 @@ public class TabPersistentStoreUnitTest {
     @SmallTest
     @Feature("TabPersistentStore")
     public void testNotActiveIncognitoNtpIgnoredDuringRestore() {
-        mPersistentStore = new TabPersistentStore(
-                mPersistencePolicy, mTabModelSelector, mTabCreatorManager, mObserver);
+        mPersistentStore =
+                new TabPersistentStore(mPersistencePolicy, mTabModelSelector, mTabCreatorManager);
         mPersistentStore.initializeRestoreVars(false);
 
         TabRestoreDetails emptyNtpDetails =
@@ -307,8 +303,8 @@ public class TabPersistentStoreUnitTest {
     @SmallTest
     @Feature("TabPersistentStore")
     public void testActiveEmptyIncognitoNtpIgnoredDuringRestoreIfIncognitoLoadingIsDisabled() {
-        mPersistentStore = new TabPersistentStore(
-                mPersistencePolicy, mTabModelSelector, mTabCreatorManager, mObserver);
+        mPersistentStore =
+                new TabPersistentStore(mPersistencePolicy, mTabModelSelector, mTabCreatorManager);
         mPersistentStore.initializeRestoreVars(true);
 
         TabRestoreDetails emptyNtpDetails =