Revert of ❄ Split off RadioButtonLayout from InfoBarControls

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

Index: chrome/android/java/src/org/chromium/chrome/browser/widget/PromoDialogLayout.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/widget/PromoDialogLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/widget/PromoDialogLayout.java
index 511566f0e4f17f70e2b1981c8daf88afc150e4d9..970507f7a2aa0370209ecaac4813367fd0bd8dce 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/widget/PromoDialogLayout.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/widget/PromoDialogLayout.java
@@ -6,7 +6,6 @@
 
 import android.content.Context;
 import android.util.AttributeSet;
-import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewStub;
 import android.widget.ImageView;
@@ -15,6 +14,7 @@
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.infobar.InfoBarControlLayout;
 import org.chromium.chrome.browser.widget.PromoDialog.DialogParams;
 
 /**
@@ -145,9 +145,11 @@
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
     }
 
-    /** Adds a View to the layout within the scrollable area. */
-    void addControl(View control) {
+    /** Adds a standardized set of controls to the layout. */
+    InfoBarControlLayout addControlLayout() {
+        InfoBarControlLayout layout = new InfoBarControlLayout(getContext());
         mScrollableContent.addView(
-                control, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
+                layout, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
+        return layout;
     }
 }