Revert of Add tab persistence support for CustomTabs.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistencePolicy.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistencePolicy.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistencePolicy.java
index a91bcde20efd6597ce49dda22c36413267e619c7..aedf958d3533b0eb9b0578be9f15c14d45436813 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistencePolicy.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistencePolicy.java
@@ -43,21 +43,18 @@
     String getStateToBeMergedFileName();
 
     /**
-     * Performs any necessary initialization required before accessing the tab information.  This
-     * can include cleanups or migrations that must occur before the tab state information can be
-     * read reliably.
+     * Performs any necessary migration required before accessing the tab information.
      *
      * @param executor The executor that any asynchronous tasks should be run on.
-     * @return Whether any blocking initialization is necessary.
+     * @return Whether any migration is necessary.
      */
-    boolean performInitialization(Executor executor);
+    boolean performMigration(Executor executor);
 
     /**
-     * Waits for the any pending initialization to finish.
-     *
-     * @see #performInitialization(Executor)
+     * Waits for the task that migrates all state files to their new location to
+     * finish.
      */
-    void waitForInitializationToFinish();
+    void waitForMigrationToFinish();
 
     /**
      * @return Whether a merge is currently in progress.