Remove TabModelSelector's dependency on ChromeFullscreenManager.

chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
index 28610dfb01583ed8f0ed54ca543efbd6d43af984..82b0d37d7c9e25e25badfb4c090e613bfeec7918 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
@@ -322,6 +322,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
         mWindowAndroid.setKeyboardAccessoryView((ViewGroup) findViewById(R.id.keyboard_accessory));
         initializeToolbar();
         initializeTabModels();
+        if (!isFinishing()) mFullscreenManager = createFullscreenManager();
     }
 
     @Override
@@ -446,11 +447,6 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
     protected final void initializeTabModels() {
         if (mTabModelsInitialized) return;
 
-        // TODO(tedchoc): FullscreenManager is required to create the TabModelSelector, but that
-        //                does not seem like the right ordering.  This should happen after
-        //                initializing the tab models.
-        mFullscreenManager = createFullscreenManager();
-
         mTabModelSelector = createTabModelSelector();
         if (mTabModelSelector == null) {
             assert isFinishing();
@@ -1267,11 +1263,10 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
      * @return The {@link TabModelSelector}, possibly null.
      */
     public TabModelSelector getTabModelSelector() {
-        // TODO(tedchoc): Enable once CCT early tab creation is fixed.
-        //if (!mTabModelsInitialized) {
-        //    throw new IllegalStateException(
-        //            "Attempting to access TabModelSelector before initialization");
-        //}
+        if (!mTabModelsInitialized) {
+            throw new IllegalStateException(
+                    "Attempting to access TabModelSelector before initialization");
+        }
         return mTabModelSelector;
     }
 
@@ -1286,11 +1281,10 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
 
     @Override
     public TabCreatorManager.TabCreator getTabCreator(boolean incognito) {
-        // TODO(tedchoc): Enable once CCT early tab creation is fixed.
-        //if (!mTabModelsInitialized) {
-        //    throw new IllegalStateException(
-        //            "Attempting to access TabCreator before initialization");
-        //}
+        if (!mTabModelsInitialized) {
+            throw new IllegalStateException(
+                    "Attempting to access TabCreator before initialization");
+        }
         return incognito ? mIncognitoTabCreator : mRegularTabCreator;
     }