Extract tabbed mode specific logic from the TabPersistenceStore.

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

Index: chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
index 3b4e539fb38528656d05faa2e7d218024eb778d0..6544d5dd86bce1e5416677b457ba7377af9e5afc 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
@@ -57,6 +57,8 @@ import org.chromium.chrome.browser.tabmodel.EmptyTabModelObserver;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.chrome.browser.tabmodel.TabModelObserver;
 import org.chromium.chrome.browser.tabmodel.TabModelSelectorImpl;
+import org.chromium.chrome.browser.tabmodel.TabPersistencePolicy;
+import org.chromium.chrome.browser.tabmodel.TabbedModeTabPersistencePolicy;
 import org.chromium.chrome.browser.toolbar.ToolbarControlContainer;
 import org.chromium.chrome.browser.util.ColorUtils;
 import org.chromium.chrome.browser.util.FeatureUtilities;
@@ -262,8 +264,14 @@ public class CustomTabActivity extends ChromeActivity {
     @Override
     public void postInflationStartup() {
         super.postInflationStartup();
-        setTabModelSelector(new TabModelSelectorImpl(this,
-                TabModelSelectorImpl.CUSTOM_TABS_SELECTOR_INDEX, getWindowAndroid(), false));
+        // TODO(tedchoc): Replace with an actual CCT implementation for the persistence policy.
+        //                Currently, this relies on checks for CUSTOM_TABS_SELECTOR_INDEX in the
+        //                main TabPersitentStore that ignores certain actions.
+        TabPersistencePolicy persistencePolicy = new TabbedModeTabPersistencePolicy(
+                this, TabModelSelectorImpl.CUSTOM_TABS_SELECTOR_INDEX);
+        setTabModelSelector(new TabModelSelectorImpl(
+                this, persistencePolicy, getWindowAndroid(), false));
+
         getToolbarManager().setCloseButtonDrawable(mIntentDataProvider.getCloseButtonDrawable());
         getToolbarManager().setShowTitle(mIntentDataProvider.getTitleVisibilityState()
                 == CustomTabsIntent.SHOW_PAGE_TITLE);