Clean up document-mode specific UI.

chrome/android/javatests/src/org/chromium/chrome/browser/policy/CombinedPolicyProviderTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/policy/CombinedPolicyProviderTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/policy/CombinedPolicyProviderTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/policy/CombinedPolicyProviderTest.java
index 648a7a7b25d7b62d9a321e5d7749280d4045a9b6..1477c33ee691d87dffdcce032d2636fb36bbaacf 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/policy/CombinedPolicyProviderTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/policy/CombinedPolicyProviderTest.java
@@ -9,9 +9,7 @@ import android.test.suitebuilder.annotation.SmallTest;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.ChromeActivity;
-import org.chromium.chrome.browser.ChromeApplication;
 import org.chromium.chrome.browser.tabmodel.TabModel;
-import org.chromium.chrome.browser.util.FeatureUtilities;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.policy.CombinedPolicyProvider;
 import org.chromium.policy.PolicyProvider;
@@ -38,7 +36,7 @@ public class CombinedPolicyProviderTest extends ChromeActivityTestCaseBase<Chrom
     public void testTerminateIncognitoSon() throws InterruptedException {
         final boolean incognitoMode = true;
 
-        TabModel incognitoTabModel = getTabModel(incognitoMode);
+        TabModel incognitoTabModel = getActivity().getTabModelSelector().getModel(incognitoMode);
         loadUrlInNewTab(DATA_URI, incognitoMode);
         loadUrlInNewTab(DATA_URI, incognitoMode);
         assertEquals(2, incognitoTabModel.getCount());
@@ -58,15 +56,4 @@ public class CombinedPolicyProviderTest extends ChromeActivityTestCaseBase<Chrom
 
         assertEquals(0, incognitoTabModel.getCount());
     }
-
-    /**
-     * Returns the appropriate {@link TabModel} depending on whether Chrome is running in Document
-     * or Tabbed mode.
-     */
-    private TabModel getTabModel(boolean incognito) {
-        if (FeatureUtilities.isDocumentMode(getInstrumentation().getTargetContext())) {
-            return ChromeApplication.getDocumentTabModelSelector().getModel(incognito);
-        }
-        return getActivity().getTabModelSelector().getModel(incognito);
-    }
 }