Revert of ❄ Split off RadioButtonLayout from InfoBarControls

chrome/android/java/src/org/chromium/chrome/browser/widget/PromoDialog.java

Index: chrome/android/java/src/org/chromium/chrome/browser/widget/PromoDialog.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/widget/PromoDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/widget/PromoDialog.java
index 2ece772cedeee874ccb3a6928762a118704fc897..1458c6accbdef5c70d2253ef94fbe12d814f53d9 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/widget/PromoDialog.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/widget/PromoDialog.java
@@ -15,6 +15,7 @@
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.infobar.InfoBarControlLayout;
 
 /**
  * Generic builder for promo dialogs.
@@ -59,12 +60,9 @@
         mDialogLayout.initialize(getDialogParams());
     }
 
-    /**
-     * Adds a View to the layout within the scrollable area.
-     * See {@link PromoDialogLayout#addControl}.
-     */
-    protected void addControl(View control) {
-        mDialogLayout.addControl(control);
+    /** Add a standardized set of dialog controls. */
+    protected InfoBarControlLayout addControlLayout() {
+        return mDialogLayout.addControlLayout();
     }
 
     @Override