Revert of ❄ Split off RadioButtonLayout from InfoBarControls

chrome/android/java/src/org/chromium/chrome/browser/locale/DefaultSearchEnginePromoDialog.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.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.view.View;
-import android.widget.Button;
 import android.widget.RadioGroup;
 import android.widget.RadioGroup.OnCheckedChangeListener;
 
 import org.chromium.base.Callback;
 import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.infobar.InfoBarControlLayout;
 import org.chromium.chrome.browser.locale.LocaleManager.SearchEnginePromoType;
 import org.chromium.chrome.browser.search_engines.TemplateUrlService;
 import org.chromium.chrome.browser.search_engines.TemplateUrlService.TemplateUrl;
 import org.chromium.chrome.browser.widget.PromoDialog;
-import org.chromium.chrome.browser.widget.RadioButtonLayout;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 /** A dialog that forces the user to choose a default search engine. */
 public class DefaultSearchEnginePromoDialog extends PromoDialog implements OnCheckedChangeListener {
     /** Used to determine the promo dialog contents. */
     @SearchEnginePromoType
     private final int mDialogType;
@@ skipping 68 matching lines @@
         List<CharSequence> engineNames = new ArrayList<>();
         List<String> engineKeywords = 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());
         }
 
         // Add the search engines to the dialog.
-        RadioButtonLayout radioButtons = new RadioButtonLayout(getContext());
-        radioButtons.addOptions(engineNames, engineKeywords);
-        radioButtons.setOnCheckedChangeListener(this);
-        addControl(radioButtons);
-
-        Button button = (Button) findViewById(R.id.button_primary);
-        button.setOnClickListener(this);
+        InfoBarControlLayout controls = addControlLayout();
+        mRadioGroup = controls.addRadioButtons(
+                engineNames, engineKeywords, InfoBarControlLayout.INVALID_INDEX);
+        mRadioGroup.setOnCheckedChangeListener(this);
         updateButtonState();
     }
 
     @Override
     public void onCheckedChanged(RadioGroup group, int checkedId) {
         mSelectedKeyword = (String) group.findViewById(checkedId).getTag();
         updateButtonState();
     }
 
     @Override
@@ skipping 23 matching lines @@
             // TODO(dfalcantara): Prevent the dialog from appearing again.
         }
 
         if (mOnDismissed != null) mOnDismissed.onResult(mSelectedKeyword != null);
     }
 
     private void updateButtonState() {
         findViewById(R.id.button_primary).setEnabled(mSelectedKeyword != null);
     }
 }