Add metrics for search engine promo and search widget

chrome/android/java/src/org/chromium/chrome/browser/locale/DefaultSearchEngineDialogHelper.java

 // Copyright 2017 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.locale;
 
 import android.support.annotation.Nullable;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
@@ skipping 21 matching lines @@
         public HelperDelegate(@SearchEnginePromoType int dialogType) {
             mDialogType = dialogType;
         }
 
         /** Determine what search engines will be listed. */
         protected List<TemplateUrl> getSearchEngines() {
             return LocaleManager.getInstance().getSearchEnginesForPromoDialog(mDialogType);
         }
 
         /** Called when the search engine the user selected is confirmed to be the one they want. */
-        protected void onUserSeachEngineChoice(String keyword) {
+        protected void onUserSeachEngineChoice(List<String> keywords, String keyword) {
             LocaleManager.getInstance().onUserSearchEngineChoiceFromPromoDialog(
-                    mDialogType, keyword);
+                    mDialogType, keywords, keyword);
         }
     }
 
     private final HelperDelegate mDelegate;
     private final Runnable mFinishRunnable;
     private final Button mConfirmButton;
 
     /**
+     * List of search engine keywords in the order shown to the user.
+     */
+    private final List<String> mSearchEngineKeywords;
+
+    /**
      * Keyword for the search engine that is selected in the RadioButtonLayout.
      * This value is not locked into the TemplateUrlService until the user confirms it by clicking
      * on {@link #mConfirmButton}.
      */
     private String mCurrentlySelectedKeyword;
 
     /**
      * Constructs a DefaultSearchEngineDialogHelper.
      *
      * @param dialogType     Dialog type to show.
      * @param controls       {@link RadioButtonLayout} that will contains all the engine options.
      * @param confirmButton  Button that the user clicks on to confirm their selection.
      * @param finishRunnable Runs after the user has confirmed their selection.
      */
     public DefaultSearchEngineDialogHelper(@SearchEnginePromoType int dialogType,
             RadioButtonLayout controls, Button confirmButton, Runnable finishRunnable) {
         mConfirmButton = confirmButton;
         mConfirmButton.setOnClickListener(this);
         mFinishRunnable = finishRunnable;
         mDelegate = createDelegate(dialogType);
 
         // Shuffle up the engines.
         List<TemplateUrl> engines = mDelegate.getSearchEngines();
         List<CharSequence> engineNames = new ArrayList<>();
-        List<String> engineKeywords = new ArrayList<>();
+        mSearchEngineKeywords = new ArrayList<>();
         Collections.shuffle(engines);
         for (int i = 0; i < engines.size(); i++) {
             TemplateUrl engine = engines.get(i);
             engineNames.add(engine.getShortName());
-            engineKeywords.add(engine.getKeyword());
+            mSearchEngineKeywords.add(engine.getKeyword());
         }
 
         // Add the search engines to the dialog without any of them being selected by default.
-        controls.addOptions(engineNames, engineKeywords);
+        controls.addOptions(engineNames, mSearchEngineKeywords);
         controls.selectChildAtIndex(RadioButtonLayout.INVALID_INDEX);
         controls.setOnCheckedChangeListener(this);
 
         // Disable the button until the user selects an option.
         updateButtonState();
     }
 
     /** @return Keyword that corresponds to the search engine that is currently selected. */
     @Nullable
     public final String getCurrentlySelectedKeyword() {
@@ skipping 13 matching lines @@
             assert false : "Unhandled click.";
             return;
         }
 
         if (mCurrentlySelectedKeyword == null) {
             // The user clicked on the button, but they haven't clicked on an option, yet.
             updateButtonState();
             return;
         }
 
-        mDelegate.onUserSeachEngineChoice(mCurrentlySelectedKeyword.toString());
+        mDelegate.onUserSeachEngineChoice(
+                mSearchEngineKeywords, mCurrentlySelectedKeyword.toString());
         mFinishRunnable.run();
     }
 
     /** Creates the delegate that interacts with the TemplateUrlService. */
     protected HelperDelegate createDelegate(@SearchEnginePromoType int dialogType) {
         return new HelperDelegate(dialogType);
     }
 
     /** Prevent the user from moving forward until they've clicked a search engine. */
     private final void updateButtonState() {
         mConfirmButton.setEnabled(mCurrentlySelectedKeyword != null);
     }
 }