Merge ApplicationSwitches.java and ChromeSwitches.java

chrome/android/java_staging/src/org/chromium/chrome/browser/ntp/NewTabPageView.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.ntp;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
@@ skipping 20 matching lines @@
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.google.android.apps.chrome.R;
 
 import org.chromium.base.CommandLine;
 import org.chromium.base.FieldTrialList;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.metrics.RecordHistogram;
-import org.chromium.chrome.browser.ApplicationSwitches;
+import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.LogoBridge.Logo;
 import org.chromium.chrome.browser.LogoBridge.LogoObserver;
 import org.chromium.chrome.browser.favicon.FaviconHelper.FaviconImageCallback;
 import org.chromium.chrome.browser.favicon.LargeIconBridge.LargeIconCallback;
 import org.chromium.chrome.browser.ntp.MostVisitedItem.MostVisitedItemManager;
 import org.chromium.chrome.browser.ntp.NewTabPage.OnSearchBoxScrollListener;
 import org.chromium.chrome.browser.profiles.MostVisitedSites.MostVisitedURLsObserver;
 import org.chromium.chrome.browser.profiles.MostVisitedSites.ThumbnailCallback;
 import org.chromium.chrome.browser.util.FeatureUtilities;
 import org.chromium.chrome.browser.util.ViewUtils;
@@ skipping 151 matching lines @@
      * Default constructor required for XML inflation.
      */
     public NewTabPageView(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
     private boolean isIconNtpEnabled() {
         // Query the field trial state first, to ensure that UMA reports the correct group.
         String fieldTrialGroup = FieldTrialList.findFullName(ICON_NTP_FIELD_TRIAL_NAME);
         CommandLine commandLine = CommandLine.getInstance();
-        if (commandLine.hasSwitch(ApplicationSwitches.DISABLE_ICON_NTP)) return false;
-        if (commandLine.hasSwitch(ApplicationSwitches.ENABLE_ICON_NTP)) return true;
+        if (commandLine.hasSwitch(ChromeSwitches.DISABLE_ICON_NTP)) return false;
+        if (commandLine.hasSwitch(ChromeSwitches.ENABLE_ICON_NTP)) return true;
         return fieldTrialGroup.equals(ICON_NTP_ENABLED_GROUP);
     }
 
     /**
      * Initializes the NTP. This must be called immediately after inflation, before this object is
      * used in any other way.
      *
      * @param manager NewTabPageManager used to perform various actions when the user interacts
      *                with the page.
      * @param isSingleUrlBarMode Whether the NTP is in single URL bar mode.
@@ skipping 727 matching lines @@
         }
 
         @Override
         public void onLoadingComplete() {
             RecordHistogram.recordCount100Histogram("NewTabPage.IconsGray", mNumGrayIcons);
             RecordHistogram.recordCount100Histogram("NewTabPage.IconsColor", mNumColorIcons);
             RecordHistogram.recordCount100Histogram("NewTabPage.IconsReal", mNumRealIcons);
         }
     }
 }