Use LevelDB storage for ShoppingPersistedTabData

We were previously using file storage until LevelDB storage was
available. LevelDB storage requires a profile so some tweaks were
made to PersistedTabDataConfiguration. One of which is the factory
pattern was used to ensure we acquire LevelDBPersistedTabDataStorage
based on the current profile and that we only have one
LevelDBPersistedTabDataStorage instance per profile.

Bug: 1129626
Change-Id: Ia1f14c9c2b6f2da02bac27ccd255152e45a4218c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2533843Reviewed-by: Yusuf Ozuysal <yusufo@chromium.org>
Reviewed-by: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
Commit-Queue: David Maunder <davidjm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827453}

chrome/android/chrome_test_java_sources.gni

@@ -560,6 +560,7 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/tab/WebContentsStateBridgeTest.java",
   "javatests/src/org/chromium/chrome/browser/tab/state/CriticalPersistedTabDataTest.java",
   "javatests/src/org/chromium/chrome/browser/tab/state/FilePersistedTabDataStorageTest.java",
+  "javatests/src/org/chromium/chrome/browser/tab/state/LevelDBPersistedTabDataStorageFactoryTest.java",
   "javatests/src/org/chromium/chrome/browser/tab/state/LevelDBPersistedTabDataStorageTest.java",
   "javatests/src/org/chromium/chrome/browser/tab/state/PersistedTabDataTest.java",
   "javatests/src/org/chromium/chrome/browser/tab/state/ShoppingPersistedTabDataTest.java",

chrome/android/features/tab_ui/javatests/src/org/chromium/chrome/browser/tasks/tab_management/TabListViewHolderTest.java

@@ -6,6 +6,9 @@ package org.chromium.chrome.browser.tasks.tab_management;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
 
 import static org.chromium.base.GarbageCollectionTestUtils.canBeGarbageCollected;
 
@@ -24,18 +27,26 @@ import android.widget.TextView;
 import androidx.test.filters.MediumTest;
 
 import org.junit.Assert;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 
 import org.chromium.base.Callback;
 import org.chromium.base.test.UiThreadTest;
 import org.chromium.base.test.util.CriteriaHelper;
+import org.chromium.base.test.util.JniMocker;
+import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.tab.MockTab;
 import org.chromium.chrome.browser.tab.Tab;
+import org.chromium.chrome.browser.tab.state.LevelDBPersistedTabDataStorage;
+import org.chromium.chrome.browser.tab.state.LevelDBPersistedTabDataStorageJni;
 import org.chromium.chrome.browser.tab.state.ShoppingPersistedTabData;
 import org.chromium.chrome.tab_ui.R;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelegate;
+import org.chromium.components.embedder_support.browser_context.BrowserContextHandle;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
 import org.chromium.ui.modelutil.PropertyModel;
 import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
@@ -54,6 +65,9 @@ import java.util.concurrent.atomic.AtomicInteger;
  */
 @RunWith(ChromeJUnit4ClassRunner.class)
 public class TabListViewHolderTest extends DummyUiActivityTestCase {
+    @Rule
+    public JniMocker mMocker = new JniMocker();
+
     private static final int TAB1_ID = 456;
     private static final int TAB2_ID = 789;
     private static final String EXPECTED_PRICE_STRING = "$287";
@@ -73,6 +87,12 @@ public class TabListViewHolderTest extends DummyUiActivityTestCase {
 
     private ViewGroup mSelectableTabListView;
 
+    @Mock
+    private Profile mProfile;
+
+    @Mock
+    private LevelDBPersistedTabDataStorage.Natives mLevelDBPersistedTabDataStorage;
+
     private TabListMediator.ThumbnailFetcher mMockThumbnailProvider =
             new TabListMediator.ThumbnailFetcher(new TabListMediator.ThumbnailProvider() {
                 @Override
@@ -124,6 +144,7 @@ public class TabListViewHolderTest extends DummyUiActivityTestCase {
     @Override
     public void setUpTest() throws Exception {
         super.setUpTest();
+        MockitoAnnotations.initMocks(this);
         ViewGroup view = new LinearLayout(getActivity());
         FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
@@ -178,6 +199,13 @@ public class TabListViewHolderTest extends DummyUiActivityTestCase {
             PropertyModelChangeProcessor.create(mSelectableModel, mSelectableTabListView,
                     TabListViewBinder::bindSelectableListTab);
         });
+        mMocker.mock(LevelDBPersistedTabDataStorageJni.TEST_HOOKS, mLevelDBPersistedTabDataStorage);
+        doNothing()
+                .when(mLevelDBPersistedTabDataStorage)
+                .init(any(LevelDBPersistedTabDataStorage.class), any(BrowserContextHandle.class));
+        doReturn(false).when(mProfile).isOffTheRecord();
+        LevelDBPersistedTabDataStorage.setSkipNativeAssertionsForTesting(true);
+        Profile.setLastUsedProfileForTesting(mProfile);
     }
 
     private void testGridSelected(ViewGroup holder, PropertyModel model) {

chrome/android/javatests/src/org/chromium/chrome/browser/tab/state/CriticalPersistedTabDataTest.java

@@ -61,8 +61,8 @@ public class CriticalPersistedTabDataTest {
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
         PersistedTabDataConfiguration.setUseTestConfig(true);
-        mStorage =
-                (MockPersistedTabDataStorage) PersistedTabDataConfiguration.getTestConfig().storage;
+        mStorage = (MockPersistedTabDataStorage) PersistedTabDataConfiguration.getTestConfig()
+                           .getStorage();
     }
 
     @SmallTest

chrome/android/javatests/src/org/chromium/chrome/browser/tab/state/LevelDBPersistedTabDataStorageFactoryTest.java

+// Copyright 2020 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.tab.state;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+
+import androidx.test.filters.SmallTest;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import org.chromium.base.test.UiThreadTest;
+import org.chromium.base.test.util.CommandLineFlags;
+import org.chromium.base.test.util.JniMocker;
+import org.chromium.chrome.browser.flags.ChromeSwitches;
+import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.profiles.ProfileManager;
+import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
+import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
+import org.chromium.components.embedder_support.browser_context.BrowserContextHandle;
+
+/**
+ * Tests relating to {@link LevelDBPersistedTabDataStorageFactory}
+ */
+@RunWith(ChromeJUnit4ClassRunner.class)
+@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
+public class LevelDBPersistedTabDataStorageFactoryTest {
+    @Rule
+    public ChromeTabbedActivityTestRule mActivityTestRule = new ChromeTabbedActivityTestRule();
+
+    @Rule
+    public JniMocker mMocker = new JniMocker();
+
+    @Mock
+    private Profile mProfile1;
+
+    @Mock
+    private Profile mProfile2;
+
+    @Mock
+    private LevelDBPersistedTabDataStorage.Natives mLevelDBPersistedTabDataStorage;
+
+    @Before
+    public void setUp() throws Exception {
+        mActivityTestRule.startMainActivityOnBlankPage();
+        MockitoAnnotations.initMocks(this);
+        mMocker.mock(LevelDBPersistedTabDataStorageJni.TEST_HOOKS, mLevelDBPersistedTabDataStorage);
+        doNothing()
+                .when(mLevelDBPersistedTabDataStorage)
+                .init(any(LevelDBPersistedTabDataStorage.class), any(BrowserContextHandle.class));
+        doNothing().when(mLevelDBPersistedTabDataStorage).destroy(anyLong());
+        doReturn(false).when(mProfile1).isOffTheRecord();
+        doReturn(false).when(mProfile2).isOffTheRecord();
+        LevelDBPersistedTabDataStorage.setSkipNativeAssertionsForTesting(true);
+    }
+
+    @SmallTest
+    @Test
+    public void testFactoryMethod() {
+        LevelDBPersistedTabDataStorageFactory factory = new LevelDBPersistedTabDataStorageFactory();
+        Profile.setLastUsedProfileForTesting(mProfile1);
+        LevelDBPersistedTabDataStorage profile1Storage = factory.create();
+        Profile.setLastUsedProfileForTesting(mProfile2);
+        LevelDBPersistedTabDataStorage profile2Storage = factory.create();
+        Profile.setLastUsedProfileForTesting(mProfile1);
+        LevelDBPersistedTabDataStorage profile1StorageAgain = factory.create();
+        Assert.assertEquals(profile1Storage, profile1StorageAgain);
+        Assert.assertNotEquals(profile1Storage, profile2Storage);
+    }
+
+    @UiThreadTest
+    @SmallTest
+    @Test
+    public void testStorageDestroyedWhenProfileDestroyed() {
+        Profile.setLastUsedProfileForTesting(null);
+        Profile profile = Profile.getLastUsedRegularProfile();
+        LevelDBPersistedTabDataStorageFactory factory = new LevelDBPersistedTabDataStorageFactory();
+        LevelDBPersistedTabDataStorage storage = factory.create();
+        ProfileManager.onProfileDestroyed(profile);
+        Assert.assertTrue(storage.isDestroyed());
+    }
+}

chrome/android/javatests/src/org/chromium/chrome/browser/tab/state/ShoppingPersistedTabDataTest.java

@@ -81,6 +81,7 @@ public class ShoppingPersistedTabDataTest {
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mMocker.mock(EndpointFetcherJni.TEST_HOOKS, mEndpointFetcherJniMock);
+        PersistedTabDataConfiguration.setUseTestConfig(true);
     }
 
     @UiThreadTest

chrome/browser/profiles/android/java/src/org/chromium/chrome/browser/profiles/ProfileManager.java

@@ -4,6 +4,8 @@
 
 package org.chromium.chrome.browser.profiles;
 
+import androidx.annotation.VisibleForTesting;
+
 import org.chromium.base.ObserverList;
 import org.chromium.base.annotations.CalledByNative;
 
@@ -59,7 +61,8 @@ public class ProfileManager {
         }
     }
 
-    static void onProfileDestroyed(Profile profile) {
+    @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
+    public static void onProfileDestroyed(Profile profile) {
         for (Observer observer : sObservers) {
             observer.onProfileDestroyed(profile);
         }

chrome/browser/tab/BUILD.gn

@@ -29,12 +29,14 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/tab/state/EncryptedFilePersistedTabDataStorage.java",
     "java/src/org/chromium/chrome/browser/tab/state/FilePersistedTabDataStorage.java",
     "java/src/org/chromium/chrome/browser/tab/state/LevelDBPersistedTabDataStorage.java",
+    "java/src/org/chromium/chrome/browser/tab/state/LevelDBPersistedTabDataStorageFactory.java",
     "java/src/org/chromium/chrome/browser/tab/state/MockPersistedTabData.java",
     "java/src/org/chromium/chrome/browser/tab/state/MockPersistedTabDataStorage.java",
     "java/src/org/chromium/chrome/browser/tab/state/PersistedTabData.java",
     "java/src/org/chromium/chrome/browser/tab/state/PersistedTabDataConfiguration.java",
     "java/src/org/chromium/chrome/browser/tab/state/PersistedTabDataFactory.java",
     "java/src/org/chromium/chrome/browser/tab/state/PersistedTabDataStorage.java",
+    "java/src/org/chromium/chrome/browser/tab/state/PersistedTabDataStorageFactory.java",
     "java/src/org/chromium/chrome/browser/tab/state/ShoppingPersistedTabData.java",
   ]
 

chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/state/CriticalPersistedTabData.java

@@ -76,9 +76,9 @@ public class CriticalPersistedTabData extends PersistedTabData {
     private CriticalPersistedTabData(Tab tab) {
         super(tab,
                 PersistedTabDataConfiguration.get(CriticalPersistedTabData.class, tab.isIncognito())
-                        .storage,
+                        .getStorage(),
                 PersistedTabDataConfiguration.get(CriticalPersistedTabData.class, tab.isIncognito())
-                        .id);
+                        .getId());
     }
 
     /**
@@ -164,7 +164,7 @@ public class CriticalPersistedTabData extends PersistedTabData {
     public static byte[] restore(int tabId, boolean isIncognito) {
         PersistedTabDataConfiguration config =
                 PersistedTabDataConfiguration.get(CriticalPersistedTabData.class, isIncognito);
-        return config.storage.restore(tabId, config.id);
+        return config.getStorage().restore(tabId, config.getId());
     }
 
     /**
@@ -176,7 +176,7 @@ public class CriticalPersistedTabData extends PersistedTabData {
     public static void restore(int tabId, boolean isIncognito, Callback<byte[]> callback) {
         PersistedTabDataConfiguration config =
                 PersistedTabDataConfiguration.get(CriticalPersistedTabData.class, isIncognito);
-        config.storage.restore(tabId, config.id, callback);
+        config.getStorage().restore(tabId, config.getId(), callback);
     }
 
     /**

chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/state/LevelDBPersistedTabDataStorage.java

@@ -20,24 +20,34 @@ import java.util.Locale;
  * of {@link PersistedTabDataStorage}.
  */
 public class LevelDBPersistedTabDataStorage implements PersistedTabDataStorage {
+    // In a mock environment, the native code will not be running so we should not
+    // make assertions about mNativePersistedStateDB
+    private static boolean sSkipNativeAssertionsForTesting;
     private long mNativePersistedStateDB;
     // Callback is only used for synchronization of save and delete in testing.
     // Otherwise it is a no-op.
     private Runnable mOnCompleteForTesting;
     // TODO(crbug.com/1146799) Apply tricks like @CheckDiscard or @RemovableInRelease to improve
     // performance
+    private boolean mIsDestroyed;
 
     LevelDBPersistedTabDataStorage(Profile profile) {
         assert !profile.isOffTheRecord()
             : "LevelDBPersistedTabDataStorage is not supported for incognito profiles";
         LevelDBPersistedTabDataStorageJni.get().init(this, profile);
-        assert mNativePersistedStateDB != 0;
+        makeNativeAssertion();
+    }
+
+    private void makeNativeAssertion() {
+        if (!sSkipNativeAssertionsForTesting) {
+            assert mNativePersistedStateDB != 0;
+        }
     }
 
     @MainThread
     @Override
     public void save(int tabId, String dataId, byte[] data) {
-        assert mNativePersistedStateDB != 0;
+        makeNativeAssertion();
         LevelDBPersistedTabDataStorageJni.get().save(
                 mNativePersistedStateDB, getKey(tabId, dataId), data, mOnCompleteForTesting);
     }
@@ -45,7 +55,7 @@ public class LevelDBPersistedTabDataStorage implements PersistedTabDataStorage {
     @MainThread
     @Override
     public void restore(int tabId, String dataId, Callback<byte[]> callback) {
-        assert mNativePersistedStateDB != 0;
+        makeNativeAssertion();
         LevelDBPersistedTabDataStorageJni.get().load(
                 mNativePersistedStateDB, getKey(tabId, dataId), callback);
     }
@@ -65,7 +75,7 @@ public class LevelDBPersistedTabDataStorage implements PersistedTabDataStorage {
     @MainThread
     @Override
     public void delete(int tabId, String dataId) {
-        assert mNativePersistedStateDB != 0;
+        makeNativeAssertion();
         LevelDBPersistedTabDataStorageJni.get().delete(
                 mNativePersistedStateDB, getKey(tabId, dataId), mOnCompleteForTesting);
     }
@@ -86,15 +96,25 @@ public class LevelDBPersistedTabDataStorage implements PersistedTabDataStorage {
      * Destroy native instance of persisted_tab_state
      */
     public void destroy() {
-        assert mNativePersistedStateDB != 0;
+        if (!sSkipNativeAssertionsForTesting) {
+            assert mNativePersistedStateDB != 0;
+        }
         LevelDBPersistedTabDataStorageJni.get().destroy(mNativePersistedStateDB);
         mNativePersistedStateDB = 0;
+        mIsDestroyed = true;
+    }
+
+    @VisibleForTesting
+    protected boolean isDestroyed() {
+        return mIsDestroyed;
     }
 
     @CalledByNative
     private void setNativePtr(long nativePtr) {
-        assert nativePtr != 0;
-        assert mNativePersistedStateDB == 0;
+        if (!sSkipNativeAssertionsForTesting) {
+            assert nativePtr != 0;
+            assert mNativePersistedStateDB == 0;
+        }
         mNativePersistedStateDB = nativePtr;
     }
 
@@ -103,8 +123,13 @@ public class LevelDBPersistedTabDataStorage implements PersistedTabDataStorage {
         mOnCompleteForTesting = onComplete;
     }
 
+    @VisibleForTesting
+    public static void setSkipNativeAssertionsForTesting(boolean skipNativeAssertionsForTesting) {
+        sSkipNativeAssertionsForTesting = skipNativeAssertionsForTesting;
+    }
+
     @NativeMethods
-    interface Natives {
+    public interface Natives {
         void init(LevelDBPersistedTabDataStorage caller, BrowserContextHandle handle);
         void destroy(long nativePersistedStateDB);
         void save(long nativePersistedStateDB, String key, byte[] data, Runnable onComplete);

chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/state/LevelDBPersistedTabDataStorageFactory.java

+// Copyright 2020 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.tab.state;
+
+import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.profiles.ProfileManager;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Creates {@link LevelDBPersistedTabDataStorage} instances per profile
+ */
+public class LevelDBPersistedTabDataStorageFactory
+        implements PersistedTabDataStorageFactory<LevelDBPersistedTabDataStorage> {
+    public static final Map<Profile, LevelDBPersistedTabDataStorage> sProfileToLevelDBStorageMap =
+            new HashMap<>();
+    private static ProfileManager.Observer sProfileManagerObserver;
+
+    LevelDBPersistedTabDataStorageFactory() {
+        if (sProfileManagerObserver == null) {
+            sProfileManagerObserver = new ProfileManager.Observer() {
+                @Override
+                public void onProfileAdded(Profile profile) {}
+
+                @Override
+                public void onProfileDestroyed(Profile destroyedProfile) {
+                    LevelDBPersistedTabDataStorage storageToDestroy =
+                            sProfileToLevelDBStorageMap.get(destroyedProfile);
+                    if (storageToDestroy != null) {
+                        storageToDestroy.destroy();
+                        sProfileToLevelDBStorageMap.remove(destroyedProfile);
+                    }
+
+                    if (sProfileToLevelDBStorageMap.isEmpty()) {
+                        ProfileManager.removeObserver(sProfileManagerObserver);
+                        sProfileManagerObserver = null;
+                    }
+                }
+            };
+            ProfileManager.addObserver(sProfileManagerObserver);
+        }
+    }
+
+    @Override
+    public LevelDBPersistedTabDataStorage create() {
+        Profile profile = Profile.getLastUsedRegularProfile();
+        LevelDBPersistedTabDataStorage storage = sProfileToLevelDBStorageMap.get(profile);
+        if (storage == null) {
+            storage = new LevelDBPersistedTabDataStorage(profile);
+            sProfileToLevelDBStorageMap.put(profile, storage);
+        }
+        return storage;
+    }
+}

chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/state/MockPersistedTabData.java

@@ -22,9 +22,9 @@ public class MockPersistedTabData extends PersistedTabData {
     public MockPersistedTabData(Tab tab, int field) {
         super(tab,
                 PersistedTabDataConfiguration.get(MockPersistedTabData.class, tab.isIncognito())
-                        .storage,
+                        .getStorage(),
                 PersistedTabDataConfiguration.get(MockPersistedTabData.class, tab.isIncognito())
-                        .id);
+                        .getId());
         mField = field;
     }
 

chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/state/PersistedTabData.java

@@ -79,7 +79,7 @@ public abstract class PersistedTabData implements UserData {
             Tab tab, PersistedTabDataFactory<T> factory, byte[] data, Class<T> clazz) {
         PersistedTabDataConfiguration config =
                 PersistedTabDataConfiguration.get(clazz, tab.isIncognito());
-        T persistedTabData = factory.create(data, config.storage, config.id);
+        T persistedTabData = factory.create(data, config.getStorage(), config.getId());
         setUserData(tab, clazz, persistedTabData);
         return persistedTabData;
     }
@@ -126,14 +126,15 @@ public abstract class PersistedTabData implements UserData {
         if (sCachedCallbacks.get(key).size() > 1) return;
         PersistedTabDataConfiguration config =
                 PersistedTabDataConfiguration.get(clazz, tab.isIncognito());
-        config.storage.restore(tab.getId(), config.id, (data) -> {
+        config.getStorage().restore(tab.getId(), config.getId(), (data) -> {
             if (data == null) {
                 tabDataCreator.onResult((tabData) -> {
                     updateLastUpdatedMs(tabData);
                     onPersistedTabDataResult(tabData, tab, clazz, key);
                 });
             } else {
-                T persistedTabDataFromStorage = factory.create(data, config.storage, config.id);
+                T persistedTabDataFromStorage =
+                        factory.create(data, config.getStorage(), config.getId());
                 if (persistedTabDataFromStorage.needsUpdate()) {
                     tabDataCreator.onResult((tabData) -> {
                         updateLastUpdatedMs(tabData);

chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/state/PersistedTabDataConfiguration.java

@@ -16,20 +16,47 @@ import java.util.Map;
 public enum PersistedTabDataConfiguration {
     // TODO(crbug.com/1059650) investigate should this go in the app code?
     // Also investigate if the storage instance should be shared.
-    CRITICAL_PERSISTED_TAB_DATA("CPTD", new FilePersistedTabDataStorage()),
-    ENCRYPTED_CRITICAL_PERSISTED_TAB_DATA("ECPTD", new EncryptedFilePersistedTabDataStorage()),
-    MOCK_PERSISTED_TAB_DATA("MPTD", new FilePersistedTabDataStorage()),
-    ENCRYPTED_MOCK_PERSISTED_TAB_DATA("EMPTD", new EncryptedFilePersistedTabDataStorage()),
-    // TODO(crbug.com/1129626) Move Shopping to Level DB based storage
-    SHOPPING_PERSISTED_TAB_DATA("SPTD", new FilePersistedTabDataStorage()),
+    CRITICAL_PERSISTED_TAB_DATA("CPTD"),
+    ENCRYPTED_CRITICAL_PERSISTED_TAB_DATA("ECPTD"),
+    MOCK_PERSISTED_TAB_DATA("MPTD"),
+    ENCRYPTED_MOCK_PERSISTED_TAB_DATA("EMPTD"),
+    SHOPPING_PERSISTED_TAB_DATA("SPTD"),
     // TODO(crbug.com/1113828) investigate separating test from prod test implementations
-    TEST_CONFIG("TC", new MockPersistedTabDataStorage());
+    TEST_CONFIG("TC");
 
     private static final Map<Class<? extends PersistedTabData>, PersistedTabDataConfiguration>
             sLookup = new HashMap<>();
     private static final Map<Class<? extends PersistedTabData>, PersistedTabDataConfiguration>
             sEncryptedLookup = new HashMap<>();
 
+    /**
+     * Ensure lazy initialization of singleton storage
+     */
+    private static FilePersistedTabDataStorage sFilePersistedTabDataStorage;
+    private static EncryptedFilePersistedTabDataStorage sEncrpytedFilePersistedTabDataStorage;
+    private static MockPersistedTabDataStorage sMockPersistedTabDataStorage;
+
+    private static FilePersistedTabDataStorage getFilePersistedTabDataStorage() {
+        if (sFilePersistedTabDataStorage == null) {
+            sFilePersistedTabDataStorage = new FilePersistedTabDataStorage();
+        }
+        return sFilePersistedTabDataStorage;
+    }
+
+    private static EncryptedFilePersistedTabDataStorage getEncryptedFilePersistedTabDataStorage() {
+        if (sEncrpytedFilePersistedTabDataStorage == null) {
+            sEncrpytedFilePersistedTabDataStorage = new EncryptedFilePersistedTabDataStorage();
+        }
+        return sEncrpytedFilePersistedTabDataStorage;
+    }
+
+    private static MockPersistedTabDataStorage getMockPersistedTabDataStorage() {
+        if (sMockPersistedTabDataStorage == null) {
+            sMockPersistedTabDataStorage = new MockPersistedTabDataStorage();
+        }
+        return sMockPersistedTabDataStorage;
+    }
+
     private static boolean sUseTestConfig;
 
     static {
@@ -40,18 +67,48 @@ public enum PersistedTabDataConfiguration {
         sEncryptedLookup.put(MockPersistedTabData.class, ENCRYPTED_MOCK_PERSISTED_TAB_DATA);
         sLookup.put(ShoppingPersistedTabData.class, SHOPPING_PERSISTED_TAB_DATA);
         sEncryptedLookup.put(ShoppingPersistedTabData.class, SHOPPING_PERSISTED_TAB_DATA);
+        CRITICAL_PERSISTED_TAB_DATA.mStorageFactory = () -> {
+            return getFilePersistedTabDataStorage();
+        };
+        ENCRYPTED_CRITICAL_PERSISTED_TAB_DATA.mStorageFactory = () -> {
+            return getEncryptedFilePersistedTabDataStorage();
+        };
+        MOCK_PERSISTED_TAB_DATA.mStorageFactory = () -> {
+            return getFilePersistedTabDataStorage();
+        };
+        ENCRYPTED_MOCK_PERSISTED_TAB_DATA.mStorageFactory = () -> {
+            return getEncryptedFilePersistedTabDataStorage();
+        };
+        SHOPPING_PERSISTED_TAB_DATA.mStorageFactory = new LevelDBPersistedTabDataStorageFactory();
+        TEST_CONFIG.mStorageFactory = () -> {
+            return getMockPersistedTabDataStorage();
+        };
     }
 
-    public final String id;
-    public final PersistedTabDataStorage storage;
+    private final String mId;
+    private PersistedTabDataStorageFactory mStorageFactory;
 
     /**
      * @param id identifier for {@link PersistedTabData}
-     * @param storage {@link PersistedTabDataStorage} associated with {@link PersistedTabData}
+     * @param storageFactory {@link PersistedTabDataStorageFactory} associated with {@link
+     *         PersistedTabData}
+     */
+    PersistedTabDataConfiguration(String id) {
+        mId = id;
+    }
+
+    /**
+     * @return {@link PersistedTabDataStorage} for a given configuration
+     */
+    public PersistedTabDataStorage getStorage() {
+        return mStorageFactory.create();
+    }
+
+    /**
+     * @return id for a given configuration
      */
-    PersistedTabDataConfiguration(String id, PersistedTabDataStorage storage) {
-        this.id = id;
-        this.storage = storage;
+    public String getId() {
+        return mId;
     }
 
     /**

chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/state/PersistedTabDataStorageFactory.java

+// Copyright 2020 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.tab.state;
+
+/**
+ * Creates a {@link PersistedTabDataStorage}
+ * @param <T> {@link PersistedTabDataStorage} being created
+ */
+public interface PersistedTabDataStorageFactory<T extends PersistedTabDataStorage> {
+    /**
+     * @return {@link PersistedTabDataStorage}
+     */
+    T create();
+}
\ No newline at end of file

chrome/browser/tab/java/src/org/chromium/chrome/browser/tab/state/ShoppingPersistedTabData.java

@@ -86,9 +86,9 @@ public class ShoppingPersistedTabData extends PersistedTabData {
     public ShoppingPersistedTabData(Tab tab) {
         super(tab,
                 PersistedTabDataConfiguration.get(ShoppingPersistedTabData.class, tab.isIncognito())
-                        .storage,
+                        .getStorage(),
                 PersistedTabDataConfiguration.get(ShoppingPersistedTabData.class, tab.isIncognito())
-                        .id);
+                        .getId());
     }
 
     private ShoppingPersistedTabData(