Clean up document-mode specific UI.

chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandlerTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandlerTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandlerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandlerTest.java
index 395a2b82d047efc359cea34964835ed99d066548..bed1a0e0e24d6a4b2047e45cc53c6b4aac6d8f27 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandlerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandlerTest.java
@@ -5,7 +5,6 @@
 package org.chromium.chrome.browser.externalnav;
 
 import android.annotation.SuppressLint;
-import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
@@ -26,7 +25,6 @@ import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler.OverrideUrlLoadingResult;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabRedirectHandler;
-import org.chromium.chrome.browser.util.FeatureUtilities;
 import org.chromium.ui.base.PageTransition;
 import org.chromium.webapk.lib.common.WebApkConstants;
 
@@ -109,7 +107,6 @@ public class ExternalNavigationHandlerTest extends InstrumentationTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        mDelegate.setContext(getInstrumentation().getTargetContext());
         CommandLine.init(new String[0]);
         RecordHistogram.disableForTests();
         mDelegate.mQueryIntentOverride = null;
@@ -945,15 +942,9 @@ public class ExternalNavigationHandlerTest extends InstrumentationTestCase {
     }
 
     private static class TestExternalNavigationDelegate implements ExternalNavigationDelegate {
-        private Context mContext;
-
-        public void setContext(Context context) {
-            mContext = context;
-        }
-
         @Override
         public List<ResolveInfo> queryIntentActivities(Intent intent) {
-            List<ResolveInfo> list = new ArrayList<ResolveInfo>();
+            List<ResolveInfo> list = new ArrayList<>();
             // TODO(yfriedman): We shouldn't have a separate global override just for tests - we
             // should mimic the appropriate intent resolution intead.
             if (mQueryIntentOverride != null) {
@@ -1014,7 +1005,6 @@ public class ExternalNavigationHandlerTest extends InstrumentationTestCase {
             if (infos == null) {
                 return result;
             }
-            int count = 0;
             for (ResolveInfo info : infos) {
                 String packageName = info.activityInfo.packageName;
                 if (packageName.equals("youtube") || packageName.equals("calendar")
@@ -1100,11 +1090,6 @@ public class ExternalNavigationHandlerTest extends InstrumentationTestCase {
         }
 
         @Override
-        public boolean isDocumentMode() {
-            return FeatureUtilities.isDocumentMode(mContext);
-        }
-
-        @Override
         public String getDefaultSmsPackageName() {
             return defaultSmsPackageName;
         }
@@ -1216,11 +1201,6 @@ public class ExternalNavigationHandlerTest extends InstrumentationTestCase {
             return this;
         }
 
-        public ExternalNavigationTestParams withHasUserGesture(boolean hasUserGesture) {
-            mHasUserGesture = hasUserGesture;
-            return this;
-        }
-
         public ExternalNavigationTestParams withRedirectHandler(TabRedirectHandler handler) {
             mRedirectHandler = handler;
             return this;
@@ -1284,7 +1264,7 @@ public class ExternalNavigationHandlerTest extends InstrumentationTestCase {
     private static class TestPackageManager extends MockPackageManager {
         @Override
         public List<ResolveInfo> queryIntentActivities(Intent intent, int flags) {
-            List<ResolveInfo> resolves = new ArrayList<ResolveInfo>();
+            List<ResolveInfo> resolves = new ArrayList<>();
             if (intent.getDataString().startsWith("market:")) {
                 resolves.add(newResolveInfo("market", "market"));
             } else if (intent.getDataString().startsWith("http://m.youtube.com")