[Android] Coordinate Infobars and Snackbars

chrome/android/java/src/org/chromium/chrome/browser/banners/SwipableOverlayView.java

Index: chrome/android/java/src/org/chromium/chrome/browser/banners/SwipableOverlayView.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/banners/SwipableOverlayView.java b/chrome/android/java/src/org/chromium/chrome/browser/banners/SwipableOverlayView.java
index 0a3c7254f2cd2f6eafab88bad0a1bf6d48b16cfa..400414ddd82df2c9ee8a80e884611c293cf372bf 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/banners/SwipableOverlayView.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/banners/SwipableOverlayView.java
@@ -18,6 +18,7 @@ import android.view.animation.DecelerateInterpolator;
 import android.view.animation.Interpolator;
 import android.widget.FrameLayout;
 
+import org.chromium.chrome.browser.tab.TabContentViewParent;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content_public.browser.GestureStateListener;
 
@@ -136,9 +137,9 @@ public abstract class SwipableOverlayView extends FrameLayout {
         return mContentViewCore;
     }
 
-    protected void addToParentView(ViewGroup parentView) {
-        if (parentView != null && parentView.indexOfChild(this) == -1) {
-            parentView.addView(this, createLayoutParams());
+    protected void addToParentView(TabContentViewParent parentView) {
+        if (getParent() == null) {
+            parentView.addInfobarView(this, createLayoutParams());
 
             // Listen for the layout to know when to animate the View coming onto the screen.
             addOnLayoutChangeListener(mLayoutChangeListener);