Clean up document-mode specific UI.

chrome/android/javatests/src/org/chromium/chrome/browser/PopupTest.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser;
 
 import android.os.Environment;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.text.TextUtils;
 
-import org.chromium.base.ContextUtils;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.infobar.InfoBar;
 import org.chromium.chrome.browser.infobar.InfoBarContainer;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
-import org.chromium.chrome.browser.util.FeatureUtilities;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.TouchCommon;
 import org.chromium.net.test.EmbeddedTestServer;
 
 import java.util.ArrayList;
 import java.util.concurrent.Callable;
 
 /**
  * Tests whether popup windows appear.
- * In document mode, this will end up spawning multiple Activities.
  */
 public class PopupTest extends ChromeActivityTestCaseBase<ChromeActivity> {
     private static final String POPUP_HTML_PATH = "/chrome/test/data/android/popup_test.html";
 
     private String mPopupHtmlUrl;
     private EmbeddedTestServer mTestServer;
 
     public PopupTest() {
         super(ChromeActivity.class);
     }
@@ skipping 37 matching lines @@
             @Override
             public Integer call() {
                 return getNumInfobarsShowing();
             }
         }));
     }
 
     @MediumTest
     @Feature({"Popup"})
     public void testPopupWindowsAppearWhenAllowed() throws Exception {
-        boolean isDocumentMode =
-                FeatureUtilities.isDocumentMode(ContextUtils.getApplicationContext());
-        final TabModelSelector selector = isDocumentMode
-                ? ChromeApplication.getDocumentTabModelSelector()
-                : getActivity().getTabModelSelector();
+        final TabModelSelector selector = getActivity().getTabModelSelector();
 
         loadUrl(mPopupHtmlUrl);
         CriteriaHelper.pollUiThread(Criteria.equals(1, new Callable<Integer>() {
             @Override
             public Integer call() {
                 return getNumInfobarsShowing();
             }
         }));
         assertEquals(1, selector.getTotalTabCount());
         final InfoBarContainer container = selector.getCurrentTab().getInfoBarContainer();
@@ skipping 29 matching lines @@
             @Override
             public boolean isSatisfied() {
                 if (getNumInfobarsShowing() != 0) return false;
                 if (selector.getTotalTabCount() != 7) return false;
                 return TextUtils.equals("Popup #3", selector.getCurrentTab().getTitle());
             }
         }, 7500, CriteriaHelper.DEFAULT_POLLING_INTERVAL);
         assertNotSame(currentTabId, selector.getCurrentTab().getId());
     }
 }