✈ Remove unnecessary flag and DocumentModeManager.

chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.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.util;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
@@ skipping 10 matching lines @@
 import org.chromium.base.ContextUtils;
 import org.chromium.base.FieldTrialList;
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.browser.AppLinkHandler;
 import org.chromium.chrome.browser.ChromeApplication;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.ChromeVersionInfo;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
-import org.chromium.chrome.browser.preferences.DocumentModeManager;
+import org.chromium.chrome.browser.tabmodel.DocumentModeAssassin;
 import org.chromium.sync.signin.AccountManagerHelper;
 import org.chromium.ui.base.DeviceFormFactor;
 
 import java.util.List;
 
 /**
  * A utility {@code class} meant to help determine whether or not certain features are supported by
  * this device.
  */
 public class FeatureUtilities {
@@ skipping 66 matching lines @@
         Bundle userRestrictions = manager.getUserRestrictions();
         return !userRestrictions.getBoolean(UserManager.DISALLOW_MODIFY_ACCOUNTS, false);
     }
 
     /**
      * Check whether Chrome should be running on document mode.
      * @param context The context to use for checking configuration.
      * @return Whether Chrome should be running on document mode.
      */
     public static boolean isDocumentMode(Context context) {
-        if (sDocumentModeDisabled == null && CommandLine.isInitialized()) {
-            initResetListener();
-            sDocumentModeDisabled = CommandLine.getInstance().hasSwitch(
-                    ChromeSwitches.DISABLE_DOCUMENT_MODE);
-        }
-        return isDocumentModeEligible(context)
-                && !DocumentModeManager.getInstance(context).isOptedOutOfDocumentMode()
-                && (sDocumentModeDisabled == null || !sDocumentModeDisabled.booleanValue());
+        return isDocumentModeEligible(context) && !DocumentModeAssassin.isOptedOutOfDocumentMode();
     }
 
     /**
      * Whether the device could possibly run in Document mode (may return true even if the document
      * mode is turned off).
      *
      * This function can't be changed to return false (even if document mode is deleted) because we
      * need to know whether a user needs to be migrated away.
      *
      * @param context The context to use for checking configuration.
@@ skipping 45 matching lines @@
      */
     public static boolean isTabSwitchingEnabledInDocumentMode(Context context) {
         return isDocumentMode(context) && isTabSwitchingEnabledInDocumentModeInternal();
     }
 
     private static boolean isTabSwitchingEnabledInDocumentModeInternal() {
         return CommandLine.getInstance().hasSwitch(
                 ChromeSwitches.ENABLE_TAB_SWITCHER_IN_DOCUMENT_MODE);
     }
 
-    private static void initResetListener() {
-        if (sResetListener != null) return;
-
-        sResetListener = new CommandLine.ResetListener() {
-            @Override
-            public void onCommandLineReset() {
-                sDocumentModeDisabled = null;
-            }
-        };
-        CommandLine.addResetListener(sResetListener);
-    }
-
     private static boolean isHerbDisallowed(Context context) {
         return isDocumentMode(context) || ChromeVersionInfo.isStableBuild()
                 || ChromeVersionInfo.isBetaBuild() || DeviceFormFactor.isTablet(context);
     }
 
     /**
      * @return Which flavor of Herb is being tested.  See {@link ChromeSwitches#HERB_FLAVOR_ANISE}
      *         and its related switches.
      */
     public static String getHerbFlavor() {
@@ skipping 77 matching lines @@
 
         if (!TextUtils.equals(oldFlavor, newFlavor)) {
             ChromePreferenceManager.getInstance(context).setCachedHerbFlavor(newFlavor);
         }
     }
 
     private static native void nativeSetDocumentModeEnabled(boolean enabled);
     private static native void nativeSetCustomTabVisible(boolean visible);
     private static native void nativeSetIsInMultiWindowMode(boolean isInMultiWindowMode);
 }