Remove Undo Options from DeviceClassManager

Undo is a per-activity setting, not a per-device setting. Therefore it
is not appropriate to let DeviceClassManager singleton to handle whether
undo is allowed.

Also it turns out that as long as TabModelImpl is only used in
ChromeTabbedActivity, undo is always going to to be enabled, so there is
no point that ENABLE_HIGH_END_UI_UNDO should exist.

BUG=555500

Review URL: https://codereview.chromium.org/1460573002

Cr-Commit-Position: refs/heads/master@{#360495}
TBR=tedchoc@chromium.org

Review URL: https://codereview.chromium.org/1489313002 .

Cr-Commit-Position: refs/branch-heads/2564@{#196}
Cr-Branched-From: 1283eca15bd9f772387f75241576cde7bdec7f54-refs/heads/master@{#359700}

8 files changed, 2 insertions, 33 deletions

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeSwitches.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeSwitches.java
index f41d9b04..7e507f7 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeSwitches.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeSwitches.java
@@ -22,9 +22,6 @@ public abstract class ChromeSwitches {
     /** Whether fullscreen support is disabled (auto hiding controls, etc...). */
     public static final String DISABLE_FULLSCREEN = "disable-fullscreen";
 
-    /** Show the undo bar for high end UI devices. */
-    public static final String ENABLE_HIGH_END_UI_UNDO = "enable-high-end-ui-undo";
-
     /** Enable toolbar swipe to change tabs in document mode */
     public static final String ENABLE_TOOLBAR_SWIPE_IN_DOCUMENT_MODE =
             "enable-toolbar-swipe-in-document-mode";
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
index 59ccf8c..a6c730b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -765,8 +765,6 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode
             }
         }
 
-        commandLine.appendSwitch(ChromeSwitches.ENABLE_HIGH_END_UI_UNDO);
-
         supportRequestWindowFeature(Window.FEATURE_ACTION_MODE_OVERLAY);
 
         // We are starting from history with a URL after data has been cleared. On Samsung this
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/device/DeviceClassManager.java b/chrome/android/java/src/org/chromium/chrome/browser/device/DeviceClassManager.java
index d1f37b6..6ad59ae 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/device/DeviceClassManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/device/DeviceClassManager.java
@@ -37,7 +37,6 @@ public class DeviceClassManager {
     private boolean mEnablePrerendering;
     private boolean mEnableToolbarSwipe;
     private boolean mEnableToolbarSwipeInDocumentMode;
-    private boolean mEnableUndo;
     private boolean mDisableDomainReliability;
 
     private final boolean mEnableFullscreen;
@@ -84,7 +83,6 @@ public class DeviceClassManager {
                 .hasSwitch(ChromeSwitches.ENABLE_ACCESSIBILITY_TAB_SWITCHER);
         mEnableFullscreen =
                 !commandLine.hasSwitch(ChromeSwitches.DISABLE_FULLSCREEN);
-        mEnableUndo = commandLine.hasSwitch(ChromeSwitches.ENABLE_HIGH_END_UI_UNDO);
         mEnableToolbarSwipeInDocumentMode =
                 commandLine.hasSwitch(ChromeSwitches.ENABLE_TOOLBAR_SWIPE_IN_DOCUMENT_MODE);
 
@@ -92,10 +90,6 @@ public class DeviceClassManager {
         if (mEnableAccessibilityLayout) {
             mEnableAnimations = false;
         }
-
-        if (SysUtils.isLowEndDevice() || mEnableAccessibilityLayout)  {
-            mEnableUndo = true;
-        }
     }
 
     /**
@@ -151,13 +145,6 @@ public class DeviceClassManager {
     }
 
     /**
-     * @return Whether or not undo is enabled.
-     */
-    public static boolean enableUndo(Context context) {
-        return getInstance().mEnableUndo || isAccessibilityModeEnabled(context);
-    }
-
-    /**
      * @return Whether or not to disable domain reliability.
      */
     public static boolean disableDomainReliability() {
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/snackbar/undo/UndoBarPopupController.java b/chrome/android/java/src/org/chromium/chrome/browser/snackbar/undo/UndoBarPopupController.java
index 0fb67a0..a50683d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/snackbar/undo/UndoBarPopupController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/snackbar/undo/UndoBarPopupController.java
@@ -64,8 +64,7 @@ public class UndoBarPopupController implements SnackbarManager.SnackbarControlle
         mContext = context;
         mTabModelObserver = new EmptyTabModelObserver() {
             private boolean disableUndo() {
-                return !DeviceClassManager.enableUndo(mContext)
-                        || DeviceClassManager.isAccessibilityModeEnabled(mContext)
+                return DeviceClassManager.isAccessibilityModeEnabled(mContext)
                         || DeviceClassManager.enableAccessibilityLayout();
             }
 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java
index 7869033..7442aa4 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelImpl.java
@@ -8,7 +8,6 @@ import org.chromium.base.ApplicationStatus;
 import org.chromium.base.ObserverList;
 import org.chromium.base.TraceEvent;
 import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
-import org.chromium.chrome.browser.device.DeviceClassManager;
 import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabCreatorManager.TabCreator;
@@ -234,8 +233,7 @@ public class TabModelImpl extends TabModelJniBridge {
 
     @Override
     public boolean supportsPendingClosures() {
-        return !isIncognito()
-                && DeviceClassManager.enableUndo(ApplicationStatus.getApplicationContext());
+        return !isIncognito();
     }
 
     @Override
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/tab/UndoIntegrationTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/tab/UndoIntegrationTest.java
index 65323cc..c985c0c 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/tab/UndoIntegrationTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/tab/UndoIntegrationTest.java
@@ -8,11 +8,9 @@ import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_NON_LOW_E
 
 import android.test.suitebuilder.annotation.LargeTest;
 
-import org.chromium.base.CommandLine;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Restriction;
 import org.chromium.base.test.util.UrlUtils;
-import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.snackbar.SnackbarManager;
 import org.chromium.chrome.browser.tabmodel.TabModel;
 import org.chromium.chrome.browser.tabmodel.TabModelUtils;
@@ -44,7 +42,6 @@ public class UndoIntegrationTest extends ChromeTabbedActivityTestBase {
 
     @Override
     public void startMainActivity() throws InterruptedException {
-        CommandLine.getInstance().appendSwitch(ChromeSwitches.ENABLE_HIGH_END_UI_UNDO);
         SnackbarManager.setDurationForTesting(1500);
         startMainActivityOnBlankPage();
     }
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreTest.java
index 1a91bc2..f464f09 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreTest.java
@@ -9,8 +9,6 @@ import android.test.suitebuilder.annotation.SmallTest;
 import android.util.SparseArray;
 
 import org.chromium.base.ThreadUtils;
-import org.chromium.base.test.util.CommandLineFlags;
-import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.TabState;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabCreatorManager.TabCreator;
@@ -443,7 +441,6 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase {
      * Tests that a real {@link TabModelImpl} will use the {@link TabPersistentStore} to write out
      * an updated metadata file when a closure is undone.
      */
-    @CommandLineFlags.Add(ChromeSwitches.ENABLE_HIGH_END_UI_UNDO)
     @SmallTest
     public void testUndoSingleTabClosureWritesTabListFile() throws Exception {
         TabModelMetaDataInfo info = TestTabModelDirectory.TAB_MODEL_METADATA_V5_NO_M18;
@@ -470,7 +467,6 @@ public class TabPersistentStoreTest extends NativeLibraryTestBase {
      * valid a valid metadata file and the TabModel's associated TabStates after closing and
      * canceling the closure of all the tabs simultaneously.
      */
-    @CommandLineFlags.Add(ChromeSwitches.ENABLE_HIGH_END_UI_UNDO)
     @SmallTest
     public void testUndoCloseAllTabsWritesTabListFile() throws Exception {
         final TabModelMetaDataInfo info = TestTabModelDirectory.TAB_MODEL_METADATA_V5_NO_M18;
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/UndoTabModelTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/UndoTabModelTest.java
index d843f53..411d57b 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/UndoTabModelTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/UndoTabModelTest.java
@@ -6,9 +6,7 @@ package org.chromium.chrome.browser.tabmodel;
 
 import android.test.suitebuilder.annotation.MediumTest;
 
-import org.chromium.base.CommandLine;
 import org.chromium.base.ThreadUtils;
-import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType;
@@ -26,7 +24,6 @@ public class UndoTabModelTest extends ChromeTabbedActivityTestBase {
 
     @Override
     public void startMainActivity() throws InterruptedException {
-        CommandLine.getInstance().appendSwitch(ChromeSwitches.ENABLE_HIGH_END_UI_UNDO);
         startMainActivityOnBlankPage();
     }