Revert of ❄ Split off RadioButtonLayout from InfoBarControls

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

Index: chrome/android/java/src/org/chromium/chrome/browser/locale/DefaultSearchEnginePromoDialog.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/locale/DefaultSearchEnginePromoDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/locale/DefaultSearchEnginePromoDialog.java
index 57ca1320d998778dafb2ab88f11d2851db276705..4720f22b5db7e4a60f7cca4b38be9a059df3c047 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/locale/DefaultSearchEnginePromoDialog.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/locale/DefaultSearchEnginePromoDialog.java
@@ -9,18 +9,17 @@
 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;
@@ -109,13 +108,10 @@
         }
 
         // 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();
     }