Migrate TabPersistentStore to one shared directory for multi-instance

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

Index: chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreTest.java
index b3a8f5e07a928d16680a9aa5c0ef012cc57497d5..eb0f1d8f98b43476eb554261b16e434d8a8830a6 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreTest.java
@@ -13,6 +13,7 @@ import android.util.SparseArray;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.AdvancedMockContext;
+import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.TabState;
 import org.chromium.chrome.browser.compositor.overlays.strip.StripLayoutHelper;
 import org.chromium.chrome.browser.snackbar.undo.UndoBarController;
@@ -255,6 +256,7 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase {
     }
 
     @SmallTest
+    @Feature({"TabPersistentStore"})
     public void testBasic() throws Exception {
         TabModelMetaDataInfo info = TestTabModelDirectory.TAB_MODEL_METADATA_V4;
         int numExpectedTabs = info.contents.length;
@@ -302,6 +304,7 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase {
     }
 
     @SmallTest
+    @Feature({"TabPersistentStore"})
     public void testInterruptedButStillRestoresAllTabs() throws Exception {
         TabModelMetaDataInfo info = TestTabModelDirectory.TAB_MODEL_METADATA_V4;
         int numExpectedTabs = info.contents.length;
@@ -375,6 +378,7 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase {
     }
 
     @SmallTest
+    @Feature({"TabPersistentStore"})
     public void testMissingTabStateButStillRestoresTab() throws Exception {
         TabModelMetaDataInfo info = TestTabModelDirectory.TAB_MODEL_METADATA_V5;
         int numExpectedTabs = info.contents.length;
@@ -417,6 +421,7 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase {
     }
 
     @SmallTest
+    @Feature({"TabPersistentStore"})
     public void testRestoresTabWithMissingTabStateWhileIgnoringIncognitoTab() throws Exception {
         TabModelMetaDataInfo info = TestTabModelDirectory.TAB_MODEL_METADATA_V5_WITH_INCOGNITO;
         int numExpectedTabs = info.contents.length;
@@ -452,6 +457,7 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase {
     }
 
     @SmallTest
+    @Feature({"TabPersistentStore"})
     public void testPrefetchActiveTab() throws Exception {
         final TabModelMetaDataInfo info = TestTabModelDirectory.TAB_MODEL_METADATA_V5_NO_M18;
         mMockDirectory.writeTabModelFiles(info, true);
@@ -493,6 +499,7 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase {
      * an updated metadata file when a closure is undone.
      */
     @SmallTest
+    @Feature({"TabPersistentStore"})
     public void testUndoSingleTabClosureWritesTabListFile() throws Exception {
         TabModelMetaDataInfo info = TestTabModelDirectory.TAB_MODEL_METADATA_V5_NO_M18;
         mMockDirectory.writeTabModelFiles(info, true);
@@ -519,6 +526,7 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase {
      * canceling the closure of all the tabs simultaneously.
      */
     @SmallTest
+    @Feature({"TabPersistentStore"})
     public void testUndoCloseAllTabsWritesTabListFile() throws Exception {
         final TabModelMetaDataInfo info = TestTabModelDirectory.TAB_MODEL_METADATA_V5_NO_M18;
         mMockDirectory.writeTabModelFiles(info, true);