Use new showSnackbar() method everywhere.

chrome/android/java/src/org/chromium/chrome/browser/snackbar/undo/UndoBarPopupController.java

Index: chrome/android/java/src/org/chromium/chrome/browser/snackbar/undo/UndoBarPopupController.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/snackbar/undo/UndoBarPopupController.java b/chrome/android/java/src/org/chromium/chrome/browser/snackbar/undo/UndoBarPopupController.java
index 22aab222b4c5626fad3faf1a72c0d33e72ee997c..9b3e822d2e93bab69e377b20c00e0c1f38e4760e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/snackbar/undo/UndoBarPopupController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/snackbar/undo/UndoBarPopupController.java
@@ -10,6 +10,7 @@ import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.Tab;
 import org.chromium.chrome.browser.device.DeviceClassManager;
+import org.chromium.chrome.browser.snackbar.Snackbar;
 import org.chromium.chrome.browser.snackbar.SnackbarManager;
 import org.chromium.chrome.browser.tabmodel.EmptyTabModelObserver;
 import org.chromium.chrome.browser.tabmodel.TabModel;
@@ -77,13 +78,13 @@ public class UndoBarPopupController implements SnackbarManager.SnackbarControlle
             @Override
             public void tabClosureUndone(Tab tab) {
                 if (disableUndo()) return;
-                mSnackbarManager.removeSnackbarEntry(UndoBarPopupController.this, tab.getId());
+                mSnackbarManager.removeMatchingSnackbars(UndoBarPopupController.this, tab.getId());
             }
 
             @Override
             public void tabClosureCommitted(Tab tab) {
                 if (disableUndo()) return;
-                mSnackbarManager.removeSnackbarEntry(UndoBarPopupController.this, tab.getId());
+                mSnackbarManager.removeMatchingSnackbars(UndoBarPopupController.this, tab.getId());
             }
 
             @Override
@@ -95,7 +96,7 @@ public class UndoBarPopupController implements SnackbarManager.SnackbarControlle
             @Override
             public void allTabsClosureCommitted() {
                 if (disableUndo()) return;
-                mSnackbarManager.removeSnackbarEntry(UndoBarPopupController.this);
+                mSnackbarManager.removeMatchingSnackbars(UndoBarPopupController.this);
             }
         };
     }
@@ -129,9 +130,9 @@ public class UndoBarPopupController implements SnackbarManager.SnackbarControlle
                 mSnackbarManager.isShowing() ? TAB_CLOSE_UNDO_TOAST_SHOWN_WARM
                                              : TAB_CLOSE_UNDO_TOAST_SHOWN_COLD,
                 TAB_CLOSE_UNDO_TOAST_COUNT);
-        mSnackbarManager.showSnackbar(mContext.getString(R.string.undo_bar_close_message),
-                content, mContext.getString(R.string.undo_bar_button_text),
-                tabId, this);
+        mSnackbarManager.showSnackbar(Snackbar.make(content, this)
+                .setTemplateText(mContext.getString(R.string.undo_bar_close_message))
+                .setAction(mContext.getString(R.string.undo_bar_button_text), tabId));
     }
 
     /**
@@ -144,9 +145,10 @@ public class UndoBarPopupController implements SnackbarManager.SnackbarControlle
      */
     private void showUndoCloseAllBar(List<Integer> closedTabIds) {
         String content = String.format(Locale.getDefault(), "%d", closedTabIds.size());
-        mSnackbarManager.showSnackbar(mContext.getString(R.string.undo_bar_close_all_message),
-                content, mContext.getString(R.string.undo_bar_button_text),
-                closedTabIds, this);
+        mSnackbarManager.showSnackbar(Snackbar.make(content, this)
+                .setTemplateText(mContext.getString(R.string.undo_bar_close_all_message))
+                .setAction(mContext.getString(R.string.undo_bar_button_text), closedTabIds));
+
     }
 
     /**