Merge ApplicationSwitches.java and ChromeSwitches.java

chrome/android/java_staging/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManager.java

 // Copyright 2015 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.dom_distiller;
 
 import android.app.Activity;
 import android.content.Context;
 import android.text.TextUtils;
 
 import com.google.android.apps.chrome.R;
 
 import org.chromium.base.CommandLine;
 import org.chromium.base.ObserverList;
 import org.chromium.base.metrics.RecordHistogram;
-import org.chromium.chrome.browser.ApplicationSwitches;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.ChromeVersionInfo;
 import org.chromium.chrome.browser.CompositorChromeActivity;
 import org.chromium.chrome.browser.EmptyTabObserver;
 import org.chromium.chrome.browser.Tab;
 import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
 import org.chromium.chrome.browser.contextualsearch.ContextualSearchObserver;
 import org.chromium.chrome.browser.dom_distiller.ReaderModePanel.ReaderModePanelHost;
 import org.chromium.chrome.browser.gsa.GSAContextDisplaySelection;
 import org.chromium.chrome.browser.tab.ChromeTab;
@@ skipping 262 matching lines @@
 
     /**
      * @return Whether Reader mode and its new UI are enabled.
      * @param context A context
      */
     public static boolean isEnabled(Context context) {
         if (context == null) return false;
 
         boolean enabled = CommandLine.getInstance().hasSwitch(ChromeSwitches.ENABLE_DOM_DISTILLER)
                 && !CommandLine.getInstance().hasSwitch(
-                        ApplicationSwitches.DISABLE_READER_MODE_BOTTOM_BAR)
+                        ChromeSwitches.DISABLE_READER_MODE_BOTTOM_BAR)
                 && !DeviceFormFactor.isTablet(context);
         if (ChromeVersionInfo.isBetaBuild() || ChromeVersionInfo.isStableBuild()) {
             enabled = enabled
                     && CommandLine.getInstance().hasSwitch(
-                               ApplicationSwitches.ENABLE_READER_MODE_BUTTON);
+                               ChromeSwitches.ENABLE_READER_MODE_BUTTON);
         }
         return enabled;
     }
 }