Changed finch study name to account for changes in the recently reviewed and...

Changed finch study name to account for changes in the recently reviewed and submitted revised Autofill Aisstant finch experiment (http://cr/221236914).

Previously, the overlay experiment was designed as a standalone finch experiment. Now, overlay_color is a parameter of the existing AutofillAssistant finch experiment.

Bug: 806868
Change-Id: I0ed398900f30480112c81a892655e0a08a81a034
Reviewed-on: https://chromium-review.googlesource.com/c/1333448
Commit-Queue: Clemens Arbesser <arbesser@google.com>
Reviewed-by: Stephane Zermatten <szermatt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607590}

chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantStudy.java

+// Copyright 2018 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.autofill_assistant;
+
+import android.graphics.Color;
+import android.support.annotation.Nullable;
+
+import org.chromium.components.variations.VariationsAssociatedData;
+
+/** Provides access to finch experiment parameters. */
+class AutofillAssistantStudy {
+    /** Autofill Assistant Study name. */
+    private static final String STUDY_NAME = "AutofillAssistant";
+    /** Variation url parameter name. */
+    private static final String URL_PARAMETER_NAME = "url";
+    /** Variation overlay parameter name. */
+    private static final String OVERLAY_PARAMETER_NAME = "overlay_color";
+
+    /** Parameter to change the color of the overlay. Returns null if the parameter is not set or
+     * invalid.*/
+    @Nullable
+    static Integer getOverlayColor() {
+        Integer color = null;
+        String overlayColor =
+                VariationsAssociatedData.getVariationParamValue(STUDY_NAME, OVERLAY_PARAMETER_NAME);
+        if (!overlayColor.isEmpty()) {
+            try {
+                color = Color.parseColor(overlayColor);
+            } catch (IllegalArgumentException exception) {
+                // ignore, return null
+            }
+        }
+        return color;
+    }
+
+    /** Parameter to change the script repository url. Returns an empty string if not set.*/
+    static String getUrl() {
+        return VariationsAssociatedData.getVariationParamValue(STUDY_NAME, URL_PARAMETER_NAME);
+    }
+}

chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiController.java

@@ -25,7 +25,6 @@ import org.chromium.chrome.browser.tabmodel.EmptyTabModelObserver;
 import org.chromium.chrome.browser.tabmodel.TabModel;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabSelectionType;
 import org.chromium.components.signin.AccountManagerFacade;
-import org.chromium.components.variations.VariationsAssociatedData;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.payments.mojom.PaymentOptions;
 
@@ -50,10 +49,6 @@ public class AutofillAssistantUiController implements AutofillAssistantUiDelegat
     /** Prefix for Intent extras relevant to this feature. */
     private static final String INTENT_EXTRA_PREFIX =
             "org.chromium.chrome.browser.autofill_assistant.";
-    /** Autofill Assistant Study name. */
-    private static final String STUDY_NAME = "AutofillAssistant";
-    /** Variation url parameter name. */
-    private static final String URL_PARAMETER_NAME = "url";
 
     /** Special parameter that enables the feature. */
     private static final String PARAMETER_ENABLED = "ENABLED";
@@ -99,8 +94,7 @@ public class AutofillAssistantUiController implements AutofillAssistantUiDelegat
      */
     public static boolean isConfigured(Bundle intentExtras) {
         return getBooleanParameter(intentExtras, PARAMETER_ENABLED)
-                && !VariationsAssociatedData.getVariationParamValue(STUDY_NAME, URL_PARAMETER_NAME)
-                            .isEmpty()
+                && !AutofillAssistantStudy.getUrl().isEmpty()
                 && ContextUtils.getAppSharedPreferences().getBoolean(
                            AutofillAssistantPreferences.PREF_AUTOFILL_ASSISTANT_SWITCH, true);
     }

chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiDelegate.java

@@ -50,7 +50,6 @@ import org.chromium.chrome.browser.help.HelpAndFeedback;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.snackbar.Snackbar;
 import org.chromium.chrome.browser.snackbar.SnackbarManager;
-import org.chromium.components.variations.VariationsAssociatedData;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.payments.mojom.PaymentOptions;
 
@@ -311,17 +310,10 @@ class AutofillAssistantUiDelegate {
                 == ViewCompat.LAYOUT_DIRECTION_RTL;
 
         // Finch experiment to adjust overlay color
-        String overlayColor = VariationsAssociatedData.getVariationParamValue(
-                "AutofillAssistantOverlay", "overlay_color");
-        if (!overlayColor.isEmpty()) {
-            try {
-                @ColorInt
-                int color = Color.parseColor(overlayColor);
-                mOverlay.setBackgroundColor(color);
-                mTouchEventFilter.setGrayOutColor(color);
-            } catch (IllegalArgumentException exception) {
-                // ignore
-            }
+        Integer overlayColor = AutofillAssistantStudy.getOverlayColor();
+        if (overlayColor != null) {
+            mOverlay.setBackgroundColor(overlayColor);
+            mTouchEventFilter.setGrayOutColor(overlayColor);
         }
 
         // TODO(crbug.com/806868): Listen for contextual search shown so as to hide this UI.

chrome/android/java_sources.gni

@@ -123,6 +123,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPaymentRequest.java",
   "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiController.java",
   "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiDelegate.java",
+  "java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantStudy.java",
   "java/src/org/chromium/chrome/browser/autofill_assistant/FeedbackContext.java",
   "java/src/org/chromium/chrome/browser/autofill_assistant/InitScreenController.java",
   "java/src/org/chromium/chrome/browser/autofill_assistant/ui/BottomBarAnimations.java",