Revert "Add debug loggings to figure out a snackbar crash"

This reverts commit 83557154.

BUG=553569

Review URL: https://codereview.chromium.org/1538473002

Cr-Commit-Position: refs/heads/master@{#367049}

chrome/android/java/res/layout/snackbar.xml

@@ -3,8 +3,7 @@
      Use of this source code is governed by a BSD-style license that can be
      found in the LICENSE file. -->
 
-<view xmlns:android="http://schemas.android.com/apk/res/android"
-    class="org.chromium.chrome.browser.snackbar.SnackbarManager$WindowDismissalAwareLayout"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="@dimen/snackbar_min_height"
@@ -45,4 +44,4 @@
         android:textSize="14sp"
         style="@style/ButtonCompatBorderless" />
 
-</view>
+</LinearLayout>

chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

@@ -259,7 +259,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
         mWindowAndroid = ((ChromeApplication) getApplicationContext())
                 .createActivityWindowAndroid(this);
         mWindowAndroid.restoreInstanceState(getSavedInstanceState());
-        mSnackbarManager = new SnackbarManager(this);
+        mSnackbarManager = new SnackbarManager(getWindow());
         mLoFiBarPopupController = new LoFiBarPopupController(this, getSnackbarManager());
         mDataUseSnackbarController = new DataUseSnackbarController(this, getSnackbarManager());
 

chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkActivity.java

@@ -35,7 +35,7 @@ public class EnhancedBookmarkActivity extends EnhancedBookmarkActivityBase imple
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-        mSnackbarManager = new SnackbarManager(this);
+        mSnackbarManager = new SnackbarManager(getWindow());
         mBookmarkManager = new EnhancedBookmarkManager(this);
         String url = getIntent().getDataString();
         if (TextUtils.isEmpty(url)) url = UrlConstants.BOOKMARKS_URL;

chrome/android/java/src/org/chromium/chrome/browser/snackbar/SnackbarManager.java

@@ -4,18 +4,13 @@
 
 package org.chromium.chrome.browser.snackbar;
 
-import android.annotation.TargetApi;
-import android.app.Activity;
-import android.content.Context;
 import android.graphics.Rect;
-import android.os.Build;
 import android.os.Handler;
-import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewTreeObserver.OnGlobalLayoutListener;
-import android.widget.LinearLayout;
+import android.view.Window;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.VisibleForTesting;
@@ -43,29 +38,6 @@ import java.util.Stack;
  */
 public class SnackbarManager implements OnClickListener, OnGlobalLayoutListener {
 
-    private static RuntimeException sWindowDetachTrace;
-
-    /**
-     * A {@link LinearLayout} that logs the stack trace when {@link #onDetachedFromWindow()} is
-     * called.
-     */
-    public static class WindowDismissalAwareLayout extends LinearLayout {
-        // TODO(ianwen): remove this class after crbug.com/553569 is fixed.
-        /**
-         * Constructor for XML inflation.
-         */
-        public WindowDismissalAwareLayout(Context context, AttributeSet attrs) {
-            super(context, attrs);
-        }
-
-        @Override
-        protected void onDetachedFromWindow() {
-            super.onDetachedFromWindow();
-            sWindowDetachTrace = new RuntimeException(
-                    "Stacktrace for Snackbar view to be detached from window");
-        }
-    }
-
     /**
      * Interface that shows the ability to provide a snackbar manager. Activities implementing this
      * interface must call {@link SnackbarManager#onStart()} and {@link SnackbarManager#onStop()} in
@@ -112,7 +84,6 @@ public class SnackbarManager implements OnClickListener, OnGlobalLayoutListener
 
     private static final int DEFAULT_SNACKBAR_DURATION_MS = 3000;
     private static final int ACCESSIBILITY_MODE_SNACKBAR_DURATION_MS = 6000;
-    private static final String TAG = "snackbar";
 
     // Used instead of the constant so tests can override the value.
     private static int sSnackbarDurationMs = DEFAULT_SNACKBAR_DURATION_MS;
@@ -120,7 +91,6 @@ public class SnackbarManager implements OnClickListener, OnGlobalLayoutListener
 
     private final boolean mIsTablet;
 
-    private Activity mActivity;
     private View mDecor;
     private final Handler mUIThreadHandler;
     private Stack<Snackbar> mStack = new Stack<Snackbar>();
@@ -140,9 +110,8 @@ public class SnackbarManager implements OnClickListener, OnGlobalLayoutListener
     /**
      * Constructs a SnackbarManager to show snackbars in the given window.
      */
-    public SnackbarManager(Activity activity) {
-        mActivity = activity;
-        mDecor = activity.getWindow().getDecorView();
+    public SnackbarManager(Window window) {
+        mDecor = window.getDecorView();
         mUIThreadHandler = new Handler();
         mIsTablet = DeviceFormFactor.isTablet(mDecor.getContext());
     }
@@ -201,30 +170,13 @@ public class SnackbarManager implements OnClickListener, OnGlobalLayoutListener
      *
      * @param isTimeout Whether dismissal was triggered by timeout.
      */
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
     public void dismissAllSnackbars(boolean isTimeout) {
         mUIThreadHandler.removeCallbacks(mHideRunnable);
 
         if (!mActivityInForeground) return;
 
         if (mPopup != null) {
-            // TODO(ianwen): remove the try catch after crbug.com/553569 is fixed.
-            try {
-                mPopup.dismiss();
-            } catch (IllegalArgumentException ex) {
-                if (mActivity != null) {
-                    android.util.Log.d(TAG, "Activity.toString()? " + mActivity);
-                    android.util.Log.d(TAG, "Activity is finishing? " + mActivity.isFinishing());
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                        android.util.Log.d(TAG, "Activity is destroyed?" + mActivity.isDestroyed());
-                    }
-                }
-                if (sWindowDetachTrace != null) {
-                    android.util.Log.d(TAG, "Window detach stack trace", sWindowDetachTrace);
-                }
-                throw ex;
-            }
-
+            mPopup.dismiss();
             mPopup = null;
         }
 
@@ -372,4 +324,4 @@ public class SnackbarManager implements OnClickListener, OnGlobalLayoutListener
         sSnackbarDurationMs = durationMs;
         sAccessibilitySnackbarDurationMs = durationMs;
     }
-}
+}
\ No newline at end of file