Moved Field Trial related code to CardsFieldTrial.

chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/CardsVariationParameters.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/CardsVariationParameters.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/CardsFieldTrial.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/CardsVariationParameters.java
similarity index 55%
rename from chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/CardsFieldTrial.java
rename to chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/CardsVariationParameters.java
index 96dcd7a0f65a002054a14cd1a2b3f2c1b7626ad7..20f8e550e3d8b62f8ed4b9fcdaf75a7d719e42cf 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/CardsFieldTrial.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/CardsVariationParameters.java
@@ -8,19 +8,23 @@ import android.text.TextUtils;
 
 import org.chromium.base.CommandLine;
 import org.chromium.base.Log;
-import org.chromium.chrome.browser.ntp.NewTabPage;
 import org.chromium.components.variations.VariationsAssociatedData;
 
 /**
  * Provides easy access to data for field trials to do with the Cards UI.
  */
-public final class CardsFieldTrial {
-    private static final String TAG = "CardFinchExperiments";
+public final class CardsVariationParameters {
+    // Tags are limited to 20 characters.
+    private static final String TAG = "CardsVariationParams";
 
-    // TODO(peconn): Move NewTabPage.FIELD_TRIAL_NAME and all uses into this class.
-    private static final String FIRST_CARD_OFFSET = "first_card_offset";
+    // Also defined in ntp_snippets_constants.cc
+    private static final String FIELD_TRIAL_NAME = "NTPSnippets";
 
-    private CardsFieldTrial() {
+    private static final String PARAM_FIRST_CARD_OFFSET = "first_card_offset";
+    private static final String PARAM_FAVICON_SERVICE_NAME = "favicons_fetch_from_service";
+    private static final String PARAM_DISABLED_VALUE = "off";
+
+    private CardsVariationParameters() {
     }
 
     /**
@@ -28,11 +32,12 @@ public final class CardsFieldTrial {
      * with a command line flag). It will return 0 if there is no such field trial.
      */
     public static int getFirstCardOffsetDp() {
-        String value = CommandLine.getInstance().getSwitchValue(FIRST_CARD_OFFSET);
+        String value = CommandLine.getInstance().getSwitchValue(PARAM_FIRST_CARD_OFFSET);
 
         if (TextUtils.isEmpty(value)) {
-            value = VariationsAssociatedData.getVariationParamValue(NewTabPage.FIELD_TRIAL_NAME,
-                    FIRST_CARD_OFFSET);
+            // TODO(jkrcal): Get parameter by feature name, not field trial name.
+            value = VariationsAssociatedData.getVariationParamValue(FIELD_TRIAL_NAME,
+                    PARAM_FIRST_CARD_OFFSET);
         }
 
         if (!TextUtils.isEmpty(value)) {
@@ -45,4 +50,9 @@ public final class CardsFieldTrial {
 
         return 0;
     }
+
+    public static boolean isFaviconServiceEnabled() {
+        return !PARAM_DISABLED_VALUE.equals(VariationsAssociatedData.getVariationParamValue(
+                FIELD_TRIAL_NAME, PARAM_FAVICON_SERVICE_NAME));
+    }
 }