Extract tabbed mode specific logic from the TabPersistenceStore.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/tabmodel/DocumentModeAssassin.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/DocumentModeAssassin.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/DocumentModeAssassin.java
index 62b3f080718751dfadf4f21c5b843e2078048975..3f8b84fb66530f3b4633357e81e90fd4e56a1d77 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/DocumentModeAssassin.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/DocumentModeAssassin.java
@@ -344,13 +344,16 @@ public class DocumentModeAssassin {
                     // If an old tab state file still exists when we run migration in TPS, then it
                     // will overwrite the new tab state file that our document tabs migrated to.
                     File oldMetadataFile = new File(
-                            getTabbedDataDirectory(), TabPersistentStore.SAVED_STATE_FILE);
+                            getTabbedDataDirectory(),
+                            TabbedModeTabPersistencePolicy.SAVED_STATE_FILE);
                     if (oldMetadataFile.exists() && !oldMetadataFile.delete()) {
                         Log.e(TAG, "Failed to delete old tab state file: " + oldMetadataFile);
                     }
 
                     TabPersistentStore.saveListToFile(
-                            getTabbedDataDirectory(), TAB_MODEL_INDEX, mSerializedMetadata);
+                            getTabbedDataDirectory(),
+                            TabbedModeTabPersistencePolicy.getStateFileName(TAB_MODEL_INDEX),
+                            mSerializedMetadata);
                     return true;
                 } else {
                     return false;
@@ -552,7 +555,7 @@ public class DocumentModeAssassin {
 
     /** @return Where tabbed mode data is stored. */
     protected File getTabbedDataDirectory() {
-        return TabPersistentStore.getOrCreateStateDirectory();
+        return TabbedModeTabPersistencePolicy.getOrCreateTabbedModeStateDirectory();
     }
 
     /** @return True if the user is not in document mode. */
@@ -565,4 +568,4 @@ public class DocumentModeAssassin {
     private void clearOptedOutState() {
         ContextUtils.getAppSharedPreferences().edit().remove(OPT_OUT_STATE).apply();
     }
-}
+}