Remove TabModelSelector's dependency on ChromeFullscreenManager.

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 0aba8d8cf7be390d5a2f4ef50ffa16da95d3a3b2..43a9e885b0a836965d6e7174688ad10c3c1a0a4f 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
@@ -265,12 +265,7 @@ public class CustomTabActivity extends ChromeActivity {
                 CustomTabsConnection.getInstance(getApplication()).getPrerenderedUrl(mSession));
         if (getSavedInstanceState() == null
                 && CustomTabsConnection.hasWarmUpBeenFinished(getApplication())) {
-            // TODO(tedchoc): Tab has dependencies on the tab model, so this should be called
-            //                before creating the tab.  That is not currently possible due to
-            //                an ordering problem with creating the Fullscreen manager.  If this
-            //                CCT were to be displaying a native page, it would likely crash, but
-            //                that doesn't happen in practice.
-            // initializeTabModels();
+            initializeTabModels();
             mMainTab = createMainTab();
             loadUrlInTab(mMainTab, new LoadUrlParams(getUrlToLoad()),
                     IntentHandler.getTimestampFromIntent(getIntent()));
@@ -318,8 +313,7 @@ public class CustomTabActivity extends ChromeActivity {
         TabPersistencePolicy persistencePolicy = new CustomTabTabPersistencePolicy(
                 getTaskId(), getSavedInstanceState() != null);
 
-        return new TabModelSelectorImpl(
-                this, this, getFullscreenManager(), persistencePolicy, false);
+        return new TabModelSelectorImpl(this, this, persistencePolicy, false);
     }
 
     @Override
@@ -900,6 +894,6 @@ public class CustomTabActivity extends ChromeActivity {
     protected ChromeFullscreenManager createFullscreenManager() {
         return new ChromeFullscreenManager(this,
                 (ToolbarControlContainer) findViewById(R.id.control_container),
-                getControlContainerHeightResource(), true);
+                getTabModelSelector(), getControlContainerHeightResource(), true);
     }
 }